Bump Truth 1.1.5 => 1.2.0 (#1206)

cashapp · Jan 8, 2024 · ab9928f · ab9928f
1 parent b404952
commit ab9928f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 1 deletion.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -67,7 +67,7 @@ trove4j = { module = "org.jetbrains.intellij.deps:trove4j", version = "1.0.20200
 # Test libraries
 junit = { module = "junit:junit", version = "4.13.2" }
 testParameterInjector = { module = "com.google.testparameterinjector:test-parameter-injector", version = "1.14" }
-truth = { module = "com.google.truth:truth", version = "1.1.5" }
+truth = { module = "com.google.truth:truth", version = "1.2.0" }
 
 # Plugins
 plugin-android = { module = "com.android.tools.build:gradle", version.ref = "agp" }

diff --git a/paparazzi-gradle-plugin/src/test/projects/build-class-next-sdk/build.gradle b/paparazzi-gradle-plugin/src/test/projects/build-class-next-sdk/build.gradle
@@ -22,3 +22,5 @@ android {
 dependencies {
   testImplementation libs.truth
 }
+
+apply from: '../common.gradle'
diff --git a/paparazzi-gradle-plugin/src/test/projects/build-class/build.gradle b/paparazzi-gradle-plugin/src/test/projects/build-class/build.gradle
@@ -22,3 +22,5 @@ android {
 dependencies {
   testImplementation libs.truth
 }
+
+apply from: '../common.gradle'
diff --git a/paparazzi-gradle-plugin/src/test/projects/common.gradle b/paparazzi-gradle-plugin/src/test/projects/common.gradle
@@ -0,0 +1,20 @@
+// TODO:
+//   Remove when https://github.com/google/guava/issues/6567 is fixed.
+//   See also: https://github.com/google/guava/issues/6801.
+plugins.withId("app.cash.paparazzi") {
+  // Defer until afterEvaluate so that testImplementation is created by Android plugin.
+  afterEvaluate {
+    dependencies.constraints {
+      add("testImplementation", "com.google.guava:guava") {
+        attributes {
+          attribute(
+            TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
+            objects.named(TargetJvmEnvironment, TargetJvmEnvironment.STANDARD_JVM)
+          )
+        }
+        because("LayoutLib and sdk-common depend on Guava's -jre published variant." +
+          "See https://github.com/cashapp/paparazzi/issues/906.")
+      }
+    }
+  }
+}
diff --git a/paparazzi-gradle-plugin/src/test/projects/lifecycle-usages/build.gradle b/paparazzi-gradle-plugin/src/test/projects/lifecycle-usages/build.gradle
@@ -23,3 +23,5 @@ dependencies {
   testImplementation 'androidx.activity:activity-compose:1.6.1'
   testImplementation libs.truth
 }
+
+apply from: '../common.gradle'
diff --git a/...radle-plugin/src/test/projects/open-assets-legacy-asset-loading-off/consumer/build.gradle b/...radle-plugin/src/test/projects/open-assets-legacy-asset-loading-off/consumer/build.gradle
@@ -25,3 +25,5 @@ dependencies {
   implementation projects.producer2
   testImplementation libs.truth
 }
+
+apply from: '../../common.gradle'
diff --git a/...gradle-plugin/src/test/projects/open-assets-legacy-asset-loading-on/consumer/build.gradle b/...gradle-plugin/src/test/projects/open-assets-legacy-asset-loading-on/consumer/build.gradle
@@ -25,3 +25,5 @@ dependencies {
   implementation projects.producer2
   testImplementation libs.truth
 }
+
+apply from: '../../common.gradle'