From ab9928f496dad1145b7240430b0dd9e3a5e4935a Mon Sep 17 00:00:00 2001
From: John Rodriguez <john.rodriguez@gmail.com>
Date: Mon, 8 Jan 2024 16:58:44 -0500
Subject: [PATCH] Bump Truth 1.1.5 => 1.2.0 (#1206)

---
 gradle/libs.versions.toml                     |  2 +-
 .../build-class-next-sdk/build.gradle         |  2 ++
 .../test/projects/build-class/build.gradle    |  2 ++
 .../src/test/projects/common.gradle           | 20 +++++++++++++++++++
 .../projects/lifecycle-usages/build.gradle    |  2 ++
 .../consumer/build.gradle                     |  2 ++
 .../consumer/build.gradle                     |  2 ++
 7 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 paparazzi-gradle-plugin/src/test/projects/common.gradle

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 23f4f9fe93..bf52a89984 100644
--- 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
index 9f06cc144c..a5a0b75e29 100644
--- 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
index 43c47ff519..38b428715c 100644
--- 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
new file mode 100644
index 0000000000..1502e3d45f
--- /dev/null
+++ 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
index b4105ca5e5..362bf510f8 100644
--- 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/paparazzi-gradle-plugin/src/test/projects/open-assets-legacy-asset-loading-off/consumer/build.gradle b/paparazzi-gradle-plugin/src/test/projects/open-assets-legacy-asset-loading-off/consumer/build.gradle
index 68d41ccf00..4db9cf0f62 100644
--- a/paparazzi-gradle-plugin/src/test/projects/open-assets-legacy-asset-loading-off/consumer/build.gradle
+++ b/paparazzi-gradle-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/paparazzi-gradle-plugin/src/test/projects/open-assets-legacy-asset-loading-on/consumer/build.gradle b/paparazzi-gradle-plugin/src/test/projects/open-assets-legacy-asset-loading-on/consumer/build.gradle
index 68d41ccf00..4db9cf0f62 100644
--- a/paparazzi-gradle-plugin/src/test/projects/open-assets-legacy-asset-loading-on/consumer/build.gradle
+++ b/paparazzi-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'