Skip to content

Commit 45e7db4

Browse files
committed
test on jdk 26
1 parent 9c08bc5 commit 45e7db4

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

buildSrc/src/main/groovy/nullaway.java-test-conventions.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ test {
7878
}
7979

8080
// Tasks for testing on other JDK versions; see https://jakewharton.com/build-on-latest-java-test-through-lowest-java/
81-
[21].each { majorVersion ->
81+
[21,26].each { majorVersion ->
8282
def jdkTest = tasks.register("testJdk$majorVersion", Test) {
8383
javaLauncher = javaToolchains.launcherFor {
8484
languageVersion = JavaLanguageVersion.of(majorVersion)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
asm = "9.3"
33
check-framework = "4.0.0"
44
support = "27.1.1"
5-
wala = "1.6.12"
5+
wala = "1.7.0"
66
commons-cli = "1.4"
77
auto-service = "1.1.1"
88
google-java-format = "1.34.1"

jdk-recent-unit-tests/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ tasks.withType(Test).configureEach { test ->
5151
// Used by com.uber.nullaway.jdk17.NullAwayModuleInfoTests
5252
"-Dtest.module.path=${configurations.testModulePath.asPath}"
5353
]
54+
// The test module jar is consumed via the synthetic module path above, so every
55+
// JDK-specific Test task needs it built before execution.
56+
dependsOn ':test-java-module:jar'
5457
}
5558

5659
// Disable tasks for specific JDK versions; we only run on the recent JDK version specified above
@@ -60,8 +63,3 @@ tasks.getByName('testJdk17').configure {
6063
tasks.getByName('testJdk21').configure {
6164
onlyIf { false }
6265
}
63-
64-
tasks.getByName('test').configure {
65-
// we need this since we don't have an implementation / api dependence on test-java-module
66-
dependsOn ':test-java-module:jar'
67-
}

0 commit comments

Comments
 (0)