Test on JDK 22 (#992)

Caught a couple small issues and also lets us clean up some stuff in build scripts.
uber · Jul 8, 2024 · ea80fe8 · ea80fe8
1 parent 1488098
commit ea80fe8
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 45 deletions.
diff --git a/buildSrc/src/main/groovy/nullaway.java-test-conventions.gradle b/buildSrc/src/main/groovy/nullaway.java-test-conventions.gradle
@@ -20,7 +20,7 @@ plugins {
 }
 
 jacoco {
-    toolVersion = "0.8.10"
+    toolVersion = "0.8.12"
 }
 
 // Do not generate reports for individual projects
@@ -64,46 +64,47 @@ test {
     ]
 }
 
-// Create a task to test on JDK 21
-def testJdk21 = tasks.register("testJdk21", Test) {
-    onlyIf {
-        // Only test on JDK 21 when using the latest Error Prone version
-        deps.versions.errorProneApi == deps.versions.errorProneLatest
-    }
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
+// Tasks for testing on other JDK versions; see https://jakewharton.com/build-on-latest-java-test-through-lowest-java/
+[21, 22].each { majorVersion ->
+    def jdkTest = tasks.register("testJdk$majorVersion", Test) {
+        onlyIf {
+            // Only run when using the latest Error Prone version
+            deps.versions.errorProneApi == deps.versions.errorProneLatest
+        }
+        javaLauncher = javaToolchains.launcherFor {
+            languageVersion = JavaLanguageVersion.of(majorVersion)
+        }
 
-    description = "Runs the test suite on JDK 21"
-    group = LifecycleBasePlugin.VERIFICATION_GROUP
+        description = "Runs the test suite on JDK $majorVersion"
+        group = LifecycleBasePlugin.VERIFICATION_GROUP
 
-    // Copy inputs from normal Test task.
-    def testTask = tasks.getByName("test")
-    classpath = testTask.classpath
-    testClassesDirs = testTask.testClassesDirs
-    maxHeapSize = "1024m"
-    // to expose necessary JDK types on JDK 16+; see https://errorprone.info/docs/installation#java-9-and-newer
-    jvmArgs += [
-        "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
-        "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
-        "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
-        // Accessed by Lombok tests
-        "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
-    ]
-}
+        // Copy inputs from normal Test task.
+        def testTask = tasks.getByName("test")
+        classpath = testTask.classpath
+        testClassesDirs = testTask.testClassesDirs
+        maxHeapSize = "1024m"
+        // to expose necessary JDK types on JDK 16+; see https://errorprone.info/docs/installation#java-9-and-newer
+        jvmArgs += [
+            "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+            "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+            "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+            "--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+            "--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+            "--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+            "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+            "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
+            // Accessed by Lombok tests
+            "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
+        ]
+    }
 
-tasks.named('check').configure {
-    dependsOn testJdk21
+    tasks.named('check').configure {
+        dependsOn jdkTest
+    }
 }
 
-
 // Share the coverage data to be aggregated for the whole product
 configurations.create('coverageDataElements') {
     visible = false

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -116,7 +116,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.5.0",
+    mockito                 : "org.mockito:mockito-core:5.12.0",
     javaxAnnotationApi      : "javax.annotation:javax.annotation-api:1.3.2",
     assertJ                 : "org.assertj:assertj-core:3.23.1",
 ]

diff --git a/jar-infer/jar-infer-lib/build.gradle b/jar-infer/jar-infer-lib/build.gradle
@@ -46,6 +46,11 @@ test {
     dependsOn ':jar-infer:test-android-lib-jarinfer:bundleReleaseAar'
 }
 
+tasks.getByName('testJdk22').configure {
+    // Won't work until WALA supports JDK 22; see https://github.com/wala/WALA/issues/1414
+    onlyIf { false }
+}
+
 tasks.withType(JavaCompile).configureEach {
     options.compilerArgs += "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"
 }

diff --git a/jdk-recent-unit-tests/build.gradle b/jdk-recent-unit-tests/build.gradle
@@ -43,8 +43,8 @@ dependencies {
     testModulePath deps.test.cfQual
 }
 
-test {
-    jvmArgs += [
+tasks.withType(Test).configureEach { test ->
+    test.jvmArgs += [
         // Expose a module path for tests as a JVM property.
         // Used by com.uber.nullaway.jdk17.NullAwayModuleInfoTests
         "-Dtest.module.path=${configurations.testModulePath.asPath}"

diff --git a/jmh/build.gradle b/jmh/build.gradle
@@ -128,11 +128,7 @@ jmh {
     // includes = ['DFlowMicro']
 }
 
-tasks.named('test') {
+tasks.withType(Test).configureEach { test ->
     // pass the extra JVM args so we can compile benchmarks in unit tests
-    jvmArgs += extraJVMArgs
-}
-
-tasks.getByName('testJdk21').configure {
-    jvmArgs += extraJVMArgs
+    test.jvmArgs += extraJVMArgs
 }
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java
@@ -400,6 +400,13 @@ private static class DefaultLibraryModels implements LibraryModels {
                     "com.google.common.base.Preconditions",
                     "<T>checkNotNull(T,java.lang.String,java.lang.Object...)"),
                 0)
+            // For JDK 22
+            // TODO check if this is still needed in JDK 23 / subsequent releases
+            .put(
+                methodRef(
+                    "com.google.common.base.Preconditions",
+                    "<T>checkNotNull(T,java.lang.String,[email protected] Object...)"),
+                0)
             .put(
                 methodRef(
                     "com.google.common.base.Preconditions",
@@ -516,6 +523,13 @@ private static class DefaultLibraryModels implements LibraryModels {
                     "com.google.common.base.Verify",
                     "<T>verifyNotNull(T,java.lang.String,java.lang.Object...)"),
                 0)
+            // For JDK 22
+            // TODO check if this is still needed in JDK 23 / subsequent releases
+            .put(
+                methodRef(
+                    "com.google.common.base.Verify",
+                    "<T>verifyNotNull(T,java.lang.String,[email protected] Object...)"),
+                0)
             .put(methodRef("java.util.Objects", "<T>requireNonNull(T)"), 0)
             .put(methodRef("java.util.Objects", "<T>requireNonNull(T,java.lang.String)"), 0)
             .put(