From b5cd1f9010f1a09ddb4b9f81dcade81e195362ab Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Wed, 3 Jan 2024 12:57:03 -0500
Subject: [PATCH 1/2] Update to WALA 1.6.3 (#887)

Fixes #829

WALA 1.6.3 supports running on JDK 21, so JarInfer now runs on JDK 21
and the tests pass.
---
 gradle/dependencies.gradle           | 2 +-
 jar-infer/jar-infer-lib/build.gradle | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 26fc151bd8..9916951dfb 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -48,7 +48,7 @@ def versions = [
     // The version of Error Prone that NullAway is compiled and tested against
     errorProneApi          : errorProneVersionToCompileAgainst,
     support                : "27.1.1",
-    wala                   : "1.6.2",
+    wala                   : "1.6.3",
     commonscli             : "1.4",
     autoValue              : "1.10.2",
     autoService            : "1.1.1",
diff --git a/jar-infer/jar-infer-lib/build.gradle b/jar-infer/jar-infer-lib/build.gradle
index 2ae8bea7a8..8ea4f9b656 100644
--- a/jar-infer/jar-infer-lib/build.gradle
+++ b/jar-infer/jar-infer-lib/build.gradle
@@ -51,12 +51,6 @@ test {
     dependsOn ':jar-infer:test-android-lib-jarinfer:bundleReleaseAar'
 }
 
-tasks.named('testJdk21', Test).configure {
-    // Tests fail since WALA does not yet support JDK 21; see https://github.com/uber/NullAway/issues/829
-    // So, disable them
-    onlyIf { false }
-}
-
 tasks.withType(JavaCompile).configureEach {
     options.compilerArgs += "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"
 }

From 257e4bb36f97776ebd4e5a95205186e4f5a4a694 Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Wed, 3 Jan 2024 14:14:42 -0500
Subject: [PATCH 2/2] Update to Error Prone 2.24.1 (#888)

Just to stay up to date.
---
 .github/workflows/continuous-integration.yml | 10 +++++-----
 gradle/dependencies.gradle                   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 62adc2fd4b..00c76abe64 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -21,16 +21,16 @@ jobs:
             epVersion: 2.10.0
           - os: macos-latest
             java: 11
-            epVersion: 2.23.0
+            epVersion: 2.24.1
           - os: ubuntu-latest
             java: 11
-            epVersion: 2.23.0
+            epVersion: 2.24.1
           - os: windows-latest
             java: 11
-            epVersion: 2.23.0
+            epVersion: 2.24.1
           - os: ubuntu-latest
             java: 17
-            epVersion: 2.23.0
+            epVersion: 2.24.1
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -63,7 +63,7 @@ jobs:
         with:
           arguments: codeCoverageReport
         continue-on-error: true
-        if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.23.0' && github.repository == 'uber/NullAway'
+        if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.24.1' && github.repository == 'uber/NullAway'
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
         with:
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 9916951dfb..01bbe70a62 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -19,7 +19,7 @@ import org.gradle.util.VersionNumber
 // The oldest version of Error Prone that we support running on
 def oldestErrorProneVersion = "2.10.0"
 // Latest released Error Prone version that we've tested with
-def latestErrorProneVersion = "2.23.0"
+def latestErrorProneVersion = "2.24.1"
 // Default to using latest tested Error Prone version
 def defaultErrorProneVersion =  latestErrorProneVersion
 def errorProneVersionToCompileAgainst = defaultErrorProneVersion