Test on JDK 25 (#1301)

msridhar · web-flow · commit 062c27c43a9e · 2025-09-24T01:09:07.000Z
We update to the latest WALA release, which supports running on JDK 25, so we can re-enable JarInfer tests. Note that running JarInfer now does not work on Temurin, since they exclude `.jmod` files from their distribution (see [the WALA docs](https://github.com/wala/WALA/wiki/Analysis-Scope)). So we switch our CI JDKs to be from the Zulu distribution. According to the CI job proposal from #1271, we should also be switching to building on JDK 25, with a separate test job for JDK 21. I will hold off on that for a bit (to check stability) and then do it in a separate PR, along with an upgrade to Gradle 9.1.0 which supports running on JDK 25. Fixes #1189  ## Summary by CodeRabbit - New Features - Added compatibility with JDK 25 by expanding the supported Java version matrix. - Tests - Updated toolchain and test tasks to target JDK 25. - Removed a previous workaround that disabled a specific JDK test task. - Chores - Upgraded dependencies: WALA to 1.6.12 and Mockito to 5.19.0. - Build/CI - CI and test generation now include JDK 25; CI JDK distribution switched to Zulu.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -25,8 +25,9 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: |
+            25
             21
-          distribution: 'temurin'
+          distribution: 'zulu'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Build and test
@@ -72,7 +73,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 21
-          distribution: 'temurin'
+          distribution: 'zulu'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Publish to Maven Local
diff --git a/buildSrc/src/main/groovy/nullaway.java-test-conventions.gradle b/buildSrc/src/main/groovy/nullaway.java-test-conventions.gradle
@@ -65,7 +65,7 @@ test {
 }
 
 // Tasks for testing on other JDK versions; see https://jakewharton.com/build-on-latest-java-test-through-lowest-java/
-[17, 24].each { majorVersion ->
+[17, 25].each { majorVersion ->
     def jdkTest = tasks.register("testJdk$majorVersion", Test) {
         onlyIf {
             // Only run when using the latest Error Prone version
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -54,7 +54,7 @@ def versions = [
     // The version of Error Prone that NullAway is compiled and tested against
     errorProneApi          : errorProneVersionToCompileAgainst,
     support                : "27.1.1",
-    wala                   : "1.6.9",
+    wala                   : "1.6.12",
     commonscli             : "1.4",
     autoValue              : "1.10.2",
     autoService            : "1.1.1",
@@ -126,7 +126,7 @@ def test = [
     springBeans             : "org.springframework:spring-beans:5.3.7",
     springContext           : "org.springframework:spring-context:5.3.7",
     grpcCore                : "io.grpc:grpc-core:1.15.1", // Should upgrade, but this matches our guava version
-    mockito                 : "org.mockito:mockito-core:5.16.1",
+    mockito                 : "org.mockito:mockito-core:5.19.0",
     javaxAnnotationApi      : "javax.annotation:javax.annotation-api:1.3.2",
     assertJ                 : "org.assertj:assertj-core:3.23.1",
     amazonUtils             : "software.amazon.awssdk:utils:2.32.19",
diff --git a/jar-infer/jar-infer-lib/build.gradle b/jar-infer/jar-infer-lib/build.gradle
@@ -50,9 +50,4 @@ tasks.withType(JavaCompile).configureEach {
     options.compilerArgs += "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"
 }
 
-tasks.getByName('testJdk24').configure {
-    // Will not work until WALA is updated to support JDK 24; see https://github.com/uber/NullAway/issues/1189
-    onlyIf { false }
-}
-
 apply plugin: 'com.vanniktech.maven.publish'
diff --git a/jar-infer/jar-infer-lib/src/main/java/com/uber/nullaway/jarinfer/DefinitelyDerefedParamsDriver.java b/jar-infer/jar-infer-lib/src/main/java/com/uber/nullaway/jarinfer/DefinitelyDerefedParamsDriver.java
@@ -47,7 +47,7 @@
 import com.ibm.wala.types.generics.TypeSignature;
 import com.ibm.wala.types.generics.TypeVariableSignature;
 import com.ibm.wala.util.collections.Iterator2Iterable;
-import com.ibm.wala.util.config.FileOfClasses;
+import com.ibm.wala.util.config.PatternsFilter;
 import com.uber.nullaway.libmodel.MethodAnnotationsRecord;
 import com.uber.nullaway.libmodel.StubxWriter;
 import java.io.ByteArrayInputStream;
@@ -240,7 +240,7 @@ private void analyzeFile(String pkgName, String inPath, boolean includeNonPublic
     }
     AnalysisScope scope = AnalysisScopeReader.instance.makeBasePrimordialScope(null);
     scope.setExclusions(
-        new FileOfClasses(
+        new PatternsFilter(
             new ByteArrayInputStream(DEFAULT_EXCLUSIONS.getBytes(StandardCharsets.UTF_8))));
     if (jarIS != null) {
       scope.addInputStreamForJarToScope(ClassLoaderReference.Application, jarIS);
diff --git a/jdk-recent-unit-tests/build.gradle b/jdk-recent-unit-tests/build.gradle
@@ -22,7 +22,7 @@ plugins {
 // We must null out sourceCompatibility and targetCompatibility to use toolchains.
 java.sourceCompatibility = null
 java.targetCompatibility = null
-java.toolchain.languageVersion.set JavaLanguageVersion.of(24)
+java.toolchain.languageVersion.set JavaLanguageVersion.of(25)
 
 configurations {
     // We use this configuration to expose a module path that can be
@@ -57,7 +57,7 @@ tasks.withType(Test).configureEach { test ->
 tasks.getByName('testJdk17').configure {
     onlyIf { false }
 }
-tasks.getByName('testJdk24').configure {
+tasks.getByName('testJdk25').configure {
     onlyIf { false }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ test {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// Tasks for testing on other JDK versions; see https://jakewharton.com/build-on-latest-java-test-through-lowest-java/`
`68`		`-[17, 24].each { majorVersion ->`
	`68`	`+[17, 25].each { majorVersion ->`
`69`	`69`	`def jdkTest = tasks.register("testJdk$majorVersion", Test) {`
`70`	`70`	`onlyIf {`
`71`	`71`	`// Only run when using the latest Error Prone version`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,4 @@ tasks.withType(JavaCompile).configureEach {`
`50`	`50`	`options.compilerArgs += "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"`
`51`	`51`	`}`
`52`	`52`
`53`		`-tasks.getByName('testJdk24').configure {`
`54`		`- // Will not work until WALA is updated to support JDK 24; see https://github.com/uber/NullAway/issues/1189`
`55`		`- onlyIf { false }`
`56`		`-}`
`57`		`-`
`58`	`53`	`apply plugin: 'com.vanniktech.maven.publish'`