From 1420355e06faf34f9cdeb7cf659b9174484afb8a Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Fri, 1 Jun 2018 09:22:16 -0700
Subject: [PATCH 1/2] Remove <optional>true</optional> from annotation
 dependency.

Such dependencies have caused problems for Guava users, so I'd expect the same here:
https://github.com/google/guava/issues/2721

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=198881918
---
 core/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index bcda6b03f..30e93a9d5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -30,7 +30,6 @@
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-compat-qual</artifactId>
       <version>${checker-framework.version}</version>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

From 882b776767adfab58642bb7fb395b0ab6d57d35d Mon Sep 17 00:00:00 2001
From: diamondm <diamondm@google.com>
Date: Fri, 1 Jun 2018 10:57:16 -0700
Subject: [PATCH 2/2] Update Truth to Guava 25.1.

Includes a workaround for https://github.com/google/compile-testing/issues/149

RELNOTES=n/a

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=198895795
---
 core/pom.xml                                           | 10 ++++++++--
 .../common/truth/ComparableSubjectCompileTest.java     |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 30e93a9d5..f79cc02f9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -10,8 +10,8 @@
   <artifactId>truth</artifactId>
   <name>Truth Core</name>
   <properties>
-    <guava.version>23.6-android</guava.version>
-    <guava-gwt.version>23.6-jre</guava-gwt.version>
+    <guava.version>25.1-android</guava.version>
+    <guava-gwt.version>25.1-jre</guava-gwt.version>
     <gwt.version>2.8.2</gwt.version>
     <junit.version>4.12</junit.version>
     <diffutils.version>1.3.0</diffutils.version>
@@ -31,6 +31,12 @@
       <artifactId>checker-compat-qual</artifactId>
       <version>${checker-framework.version}</version>
     </dependency>
+    <!-- Manually add a dependency that guava-gwt needs but doesn't declare as of May 2018. -->
+    <dependency>
+      <groupId>org.checkerframework</groupId>
+      <artifactId>checker-qual</artifactId>
+      <version>${checker-framework.version}</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/core/src/test/java/com/google/common/truth/ComparableSubjectCompileTest.java b/core/src/test/java/com/google/common/truth/ComparableSubjectCompileTest.java
index 46c0f85b8..767fbd0fd 100644
--- a/core/src/test/java/com/google/common/truth/ComparableSubjectCompileTest.java
+++ b/core/src/test/java/com/google/common/truth/ComparableSubjectCompileTest.java
@@ -55,6 +55,8 @@ public void comparableMixedTypesDontCompile() {
 
     assertAbout(javaSource())
         .that(file)
+        // https://github.com/google/compile-testing/issues/149
+        .withCompilerOptions("-sourcepath", "")
         .failsToCompile()
         .withErrorContaining("java.lang.String cannot be converted to test.MyTest.ComparableType")
         .in(file)
@@ -84,6 +86,8 @@ public void rawComparableTypeMixedTypes() {
             "}");
     assertAbout(javaSource())
         .that(file)
+        // https://github.com/google/compile-testing/issues/149
+        .withCompilerOptions("-sourcepath", "")
         .failsToCompile()
         .withErrorContaining(
             "java.lang.String cannot be converted to test.MyTest.RawComparableType")