srctree

Robin Linden parent 6ad4d2f1 fcf46505
Switch to a nicer guava/listenablefuture workaround

atox/build.gradle.kts added: 15, removed: 11, total 4

@@ -62,7 +62,6 @@ dependencies {

implementation(libs.androidx.fragment)

implementation(libs.google.android.material)

implementation(libs.google.guava.workaround)

implementation(libs.kotlinx.coroutines.core)

implementation(libs.kotlinx.coroutines.android)

@@ -95,4 +94,10 @@ dependencies {

androidTestImplementation(libs.test.espresso.contrib)

androidTestImplementation(libs.test.junit.ext)

kspAndroidTest(libs.google.dagger.compiler)

modules {

module("com.google.guava:listenablefuture") {

replacedBy("com.google.guava:guava", "listenablefuture is part of guava")

}

domain/build.gradle.kts added: 15, removed: 11, total 4

@@ -69,9 +69,14 @@ dependencies {

androidTestImplementation(kotlin("test"))

androidTestImplementation(libs.test.runner)

androidTestImplementation(libs.test.junit.ext)

androidTestImplementation(libs.google.guava.workaround)

androidTestImplementation(libs.kotlinx.coroutines.test) {

// Conflicts with a lot of things due to having embedded "byte buddy" instead of depending on it.A

exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-debug")

}

modules {

module("com.google.guava:listenablefuture") {

replacedBy("com.google.guava:guava", "listenablefuture is part of guava")

}

gradle/libs.versions.toml added: 15, removed: 11, total 4

@@ -71,10 +71,4 @@ test-junit-ext = "androidx.test.ext:junit:1.1.5"

test-rules = "androidx.test:rules:1.5.0"

test-runner = "androidx.test:runner:1.5.2"

# Google's very impressive workaround for the following error:

# Duplicate class com.google.common.util.concurrent.ListenableFuture found

# in modules jetified-guava-19.0 (com.google.guava:guava:19.0) and

# jetified-listenablefuture-1.0 (com.google.guava:listenablefuture:1.0)

google-guava-workaround = "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"

[bundles]