Skip to content

Commit 7308a92

Browse files
committed
Allow ErrorProne to run on JDK 26
1 parent ce61dca commit 7308a92

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

gradle/libs.versions.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
3434
checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }
3535
classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.181" }
3636
commons-io = { module = "commons-io:commons-io", version = "2.20.0" }
37-
38-
# check whether JDK 26 condition in junitbuild.java-nullability-conventions.gradle.kts can be removed when updating
3937
errorProne-core = { module = "com.google.errorprone:error_prone_core", version = "2.42.0" }
40-
4138
fastcsv = { module = "de.siegmar:fastcsv", version = "4.0.0" }
4239
groovy = { module = "org.apache.groovy:groovy", version = "5.0.1" }
4340
groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.23" }

gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ nullaway {
2727

2828
tasks.withType<JavaCompile>().configureEach {
2929
options.errorprone {
30-
val onJ9 = java.toolchain.implementation.orNull == JvmImplementation.J9
31-
// Workaround for https://github.com/google/error-prone/issues/5200
32-
val onJdk26 = java.toolchain.languageVersion.get() >= JavaLanguageVersion.of(26)
33-
val shouldDisableErrorProne = onJ9 || onJdk26
30+
val shouldDisableErrorProne = java.toolchain.implementation.orNull == JvmImplementation.J9
3431
if (name == "compileJava" && !shouldDisableErrorProne) {
3532
disable(
3633

0 commit comments

Comments
 (0)