From ce971d5008cf9e385370105441d962a7dda92104 Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Sat, 7 Oct 2023 16:58:21 -0700
Subject: [PATCH] WIP

---
 .github/workflows/continuous-integration.yml |  4 ++--
 gradle/dependencies.gradle                   |  4 ++--
 guava-recent-unit-tests/build.gradle         |  2 +-
 nullaway/build.gradle                        | 13 +------------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 124952f36c..ec47cd2c4f 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -15,10 +15,10 @@ jobs:
         include:
           - os: ubuntu-latest
             java: 11
-            epVersion: 2.4.0
+            epVersion: 2.10.0
           - os: ubuntu-latest
             java: 17
-            epVersion: 2.4.0
+            epVersion: 2.10.0
           - os: macos-latest
             java: 11
             epVersion: 2.22.0
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index e31eb389e8..0e295a96fb 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -17,7 +17,7 @@ import org.gradle.util.VersionNumber
  */
 
 // The oldest version of Error Prone that we support running on
-def oldestErrorProneVersion = "2.4.0"
+def oldestErrorProneVersion = "2.10.0"
 // Latest released Error Prone version that we've tested with
 def latestErrorProneVersion = "2.22.0"
 // Default to using latest tested Error Prone version
@@ -72,7 +72,7 @@ def build = [
     errorProneJavac         : "com.google.errorprone:javac:9+181-r4173-1",
     errorProneTestHelpers   : "com.google.errorprone:error_prone_test_helpers:${versions.errorProneApi}",
     checkerDataflow         : "org.checkerframework:dataflow-nullaway:${versions.checkerFramework}",
-    guava                   : "com.google.guava:guava:24.1.1-jre",
+    guava                   : "com.google.guava:guava:30.1-jre",
     javaxValidation         : "javax.validation:validation-api:2.0.1.Final",
     jspecify                : "org.jspecify:jspecify:0.3.0",
     jsr305Annotations       : "com.google.code.findbugs:jsr305:3.0.2",
diff --git a/guava-recent-unit-tests/build.gradle b/guava-recent-unit-tests/build.gradle
index 4d78ac52a3..7740123bba 100644
--- a/guava-recent-unit-tests/build.gradle
+++ b/guava-recent-unit-tests/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 def jdk8Test = tasks.register("testJdk8", Test) {
     onlyIf {
         // Only if we are using a version of Error Prone compatible with JDK 8
-        deps.versions.errorProneApi == "2.4.0"
+        deps.versions.errorProneApi == "2.10.0"
     }
 
     javaLauncher = javaToolchains.launcherFor {
diff --git a/nullaway/build.gradle b/nullaway/build.gradle
index 83f7e62e21..8000dbc9e3 100644
--- a/nullaway/build.gradle
+++ b/nullaway/build.gradle
@@ -70,17 +70,6 @@ javadoc {
     failOnError = false
 }
 
-
-test {
-    if (deps.versions.errorProneApi == "2.4.0" && JavaVersion.current() >= JavaVersion.VERSION_17) {
-        // This test does not pass on JDK 17 with Error Prone 2.4.0 due to a Mockito incompatibility.  Skip it (the
-        // test passes with more recent Error Prone versions on JDK 17)
-        filter {
-            excludeTestsMatching "com.uber.nullaway.NullAwaySerializationTest.suggestNullableArgumentOnBytecodeNoFileInfo"
-        }
-    }
-}
-
 apply plugin: 'com.vanniktech.maven.publish'
 
 // These --add-exports arguments are required when targeting JDK 11+ since Error Prone and NullAway access a bunch of
@@ -107,7 +96,7 @@ apply plugin: 'com.vanniktech.maven.publish'
 def jdk8Test = tasks.register("testJdk8", Test) {
     onlyIf {
         // Only if we are using a version of Error Prone compatible with JDK 8
-        deps.versions.errorProneApi == "2.4.0"
+        deps.versions.errorProneApi == "2.10.0"
     }
 
     javaLauncher = javaToolchains.launcherFor {