Skip to content

Commit 820019d

Browse files
committed
Preemptively update for eisop#825.
This won't build until after that PR, but I haven't rebased onto it yet.
1 parent 017cffc commit 820019d

File tree

1 file changed

+1
-29
lines changed

1 file changed

+1
-29
lines changed

build.gradle

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,6 @@ ext {
3939
// On a Java 8 JVM, use error-prone javac and source/target 8.
4040
// On a Java 9+ JVM, use the host javac, default source/target, and required module flags.
4141
isJava8 = JavaVersion.current() == JavaVersion.VERSION_1_8
42-
isJava14 = JavaVersion.current() == JavaVersion.VERSION_14
43-
isJava15 = JavaVersion.current() == JavaVersion.VERSION_15
44-
isJava16 = JavaVersion.current() == JavaVersion.VERSION_16
45-
isJava17 = JavaVersion.current() == JavaVersion.VERSION_17
46-
isJava18 = JavaVersion.current() == JavaVersion.VERSION_18
47-
isJava19 = JavaVersion.current() == JavaVersion.VERSION_19
48-
isJava20 = JavaVersion.current() == JavaVersion.VERSION_20
49-
isJava21 = JavaVersion.current() == JavaVersion.VERSION_21
50-
isJava22 = JavaVersion.current() == JavaVersion.VERSION_22
51-
isJava23 = JavaVersion.current() == JavaVersion.VERSION_23
52-
isJava24 = JavaVersion.current() == JavaVersion.VERSION_24
53-
isJava25 = JavaVersion.current() == JavaVersion.VERSION_25
54-
isJava26 = JavaVersion.current() == JavaVersion.VERSION_26
55-
56-
isJava26plus = isJava26
57-
isJava25plus = isJava25 || isJava26plus
58-
isJava24plus = isJava24 || isJava25plus
59-
isJava23plus = isJava23 || isJava24plus
60-
isJava22plus = isJava22 || isJava23plus
61-
isJava21plus = isJava21 || isJava22plus
62-
isJava20plus = isJava20 || isJava21plus
63-
isJava19plus = isJava19 || isJava20plus
64-
isJava18plus = isJava18 || isJava19plus
65-
isJava17plus = isJava17 || isJava18plus
66-
isJava16plus = isJava16 || isJava17plus
67-
isJava15plus = isJava15 || isJava16plus
68-
isJava14plus = isJava14 || isJava15plus
69-
isJava11plus = JavaVersion.current() >= JavaVersion.VERSION_11
7042

7143
// As of 2023-09-23, delombok doesn't yet support JDK 22; see https://projectlombok.org/changelog .
7244
skipDelombok = JavaVersion.current() > JavaVersion.VERSION_21
@@ -471,7 +443,7 @@ allprojects {
471443
// TODO: Ignore this-escape for now, we may want to review and suppress each one later.
472444
lint +=',-this-escape'
473445
}
474-
if (isJava23plus && !jdk17Compiler) {
446+
if (useJdkCompiler >= 23) {
475447
// TODO: Ignore dangling-doc-comments for now, we may want to fix them later.
476448
lint +=',-dangling-doc-comments'
477449
}

0 commit comments

Comments
 (0)