Add guava to debugImplementation to solve dependency resolution confl…

…icts
rubensousa · Mar 13, 2024 · 2463100 · 2463100
1 parent 1991663
commit 2463100
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/dpadrecyclerview-compose/build.gradle b/dpadrecyclerview-compose/build.gradle
@@ -54,7 +54,6 @@ android {
 
 dependencies {
     api project(':dpadrecyclerview')
-    api libs.androidx.concurrent.futures
     implementation libs.androidx.appcompat
     implementation libs.androidx.recyclerview
     implementation libs.androidx.customview.poolingcontainer

diff --git a/dpadrecyclerview-test-fixtures/build.gradle b/dpadrecyclerview-test-fixtures/build.gradle
@@ -31,6 +31,6 @@ dependencies {
     implementation libs.androidx.collection
     implementation libs.junit
     implementation libs.truth
-    api libs.androidx.test.uiautomator
-    api libs.androidx.test.runner
+    implementation libs.androidx.test.uiautomator
+    implementation libs.androidx.test.runner
 }
diff --git a/dpadrecyclerview/build.gradle b/dpadrecyclerview/build.gradle
@@ -56,6 +56,8 @@ dependencies {
     api libs.androidx.recyclerview
     implementation libs.androidx.collection
 
+    // Required for dependency resolution
+    debugImplementation libs.guava
     debugImplementation libs.androidx.fragment.testing.manifest
     testImplementation libs.junit
     testImplementation libs.truth

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -26,8 +26,7 @@ androidx-test-runner = '1.5.2'
 androidx-test-services = '1.4.2'
 androidx-test-uiautomator = '2.3.0'
 
-# "https://github.com/google/guava/issues/6618"
-listenablefuture = "9999.0-empty-to-avoid-conflict-with-guava"
+guava = "33.1.0-android"
 timber = "5.0.1"
 
 
@@ -82,8 +81,8 @@ androidx-test-services = { module = "androidx.test.services:test-services", vers
 androidx-test-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-espressoTruth" }
 androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx-test-uiautomator" }
 decorator = { module = "com.rubensousa:decorator", version.ref = "decorator" }
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
 junit = { module = "junit:junit", version.ref = "test-junit" }
-listenablefuture = { module = "com.google.guava:listenablefuture", version.ref = "listenablefuture" }
 mockk = { module = "io.mockk:mockk", version.ref = "test-mockk" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 truth = { module = "com.google.truth:truth", version.ref = "test-truth" }