Merge branch 'master' into ep-2.24.0

uber · Jan 3, 2024 · 07bcc51 · 07bcc51
2 parents 4b39e3b + b5cd1f9
commit 07bcc51
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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"
 }