Fix Paparazzi vs Truth's Guava conflict according to cashapp/paparazz…

…i#906
TWiStErRob · May 30, 2023 · 3714c00 · 3714c00
1 parent 116e5dd
commit 3714c00
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/component/paparazzi/build.gradle.kts b/component/paparazzi/build.gradle.kts
@@ -4,6 +4,13 @@ plugins {
 
 dependencies {
 	api(libs.test.paparazzi)
+	api(libs.guava.jre) {
+		// TODEL This can be removed once Paparazzi 1.3.0 is used. 
+		because(
+			"Help paparazzi transitively select the -jre flavor instead of -android. "
+				+ "See https://github.com/cashapp/paparazzi/issues/906."
+		)
+	}
 	api(libs.test.junit4)
 	api(libs.test.mockito)
 	api(libs.test.paramInjector)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -27,6 +27,7 @@ dagger = "2.46.1"
 # Changelog (4.x and 5.x): https://github.com/mockito/mockito/releases
 mockito = "5.3.1"
 
+# TODO Remove guava hack from :component:paparazzi once Paparazzi 1.3.0 is used.
 paparazzi = "1.2.0"
 
 test-jsonAssert = "1.5.1"
@@ -58,6 +59,8 @@ kotlin-detekt-libraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-l
 dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 
+guava-jre = { module = "com.google.guava:guava", version = "32.0.0-jre" }
+
 test-paparazzi = { module = "app.cash.paparazzi:paparazzi", version.ref = "paparazzi" }
 test-paparazziGradle = { module = "app.cash.paparazzi:app.cash.paparazzi.gradle.plugin", version.ref = "paparazzi" }
 test-junit4 = { module = "junit:junit", version = "4.13.2" }