Skip to content

Commit 65e6f21

Browse files
committed
Only enable and apply errorprone dependency on Java 21+
1 parent 12530c4 commit 65e6f21

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

‎build-logic/src/main/kotlin/spotless.error-prone.gradle.kts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@ plugins {
44
id("net.ltgt.errorprone")
55
}
66

7+
// error_prone_core 2.43.0+ requires Java 21+ to run (compiled with classfile version 65.0).
8+
val isJava21Compatible = JavaVersion.current() >= JavaVersion.VERSION_21
9+
710
tasks.withType<JavaCompile>().configureEach {
811
options.errorprone {
9-
enabled = System.getenv("error-prone")?.toBooleanGroovy() == true
12+
enabled =
13+
isJava21Compatible &&
14+
(System.getProperty("error-prone")?.toBooleanGroovy() == true ||
15+
System.getenv("error-prone")?.toBooleanGroovy() == true)
1016
// https://github.com/diffplug/spotless/issues/2745
1117
// https://github.com/google/error-prone/issues/5365
1218
disableAllWarnings = true
@@ -34,5 +40,7 @@ tasks.withType<JavaCompile>().configureEach {
3440
}
3541

3642
dependencies {
37-
errorprone(libs.errorprone.core)
43+
if (isJava21Compatible) {
44+
errorprone(libs.errorprone.core)
45+
}
3846
}

0 commit comments

Comments
 (0)