Skip to content

Commit 2f4c35c

Browse files
committed
BUILD target Java 17 in picocli-shell-jline3 build when possible
1 parent 63a2be3 commit 2f4c35c

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

dependencies.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
// Spring Boot 3.0 requires Java 17 as a minimum version
55
boolean useSpring3 = JavaVersion.current().majorVersion.compareTo("17") >= 0;
6-
logger.quiet("JavaVersion=${JavaVersion.current()}")
7-
logger.quiet("JavaVersion.majorVersion=${JavaVersion.current().majorVersion}")
8-
logger.quiet("useSpring3=${useSpring3}")
6+
logger.quiet("dependencies.gradle: JavaVersion=${JavaVersion.current()}")
7+
logger.quiet("dependencies.gradle: JavaVersion.majorVersion=${JavaVersion.current().majorVersion}")
8+
logger.quiet("dependencies.gradle: useSpring3=${useSpring3}")
99

1010
ext {
1111
// PICOCLI VERSION

picocli-shell-jline3/build.gradle

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,18 @@ description 'Picocli Shell JLine3 - easily build interactive shell applications
77
version "$projectVersion"
88
ext.moduleName = 'info.picocli.shell.jline3'
99

10-
sourceCompatibility = 1.8
11-
targetCompatibility = 1.8
10+
// Spring 3 requires Java 17
11+
boolean useJava17 = JavaVersion.current().majorVersion.compareTo("17") >= 0;
12+
if (useJava17) {
13+
logger.quiet("picocli-shell-jline3/build.gradle: JavaVersion=${JavaVersion.current()}")
14+
logger.quiet("picocli-shell-jline3/build.gradle: sourceCompatibility = 17")
15+
logger.quiet("picocli-shell-jline3/build.gradle: targetCompatibility = 17")
16+
sourceCompatibility = 17
17+
targetCompatibility = 17
18+
} else { // from Java 9 and up
19+
sourceCompatibility = 1.8
20+
targetCompatibility = 1.8
21+
}
1222

1323
dependencies {
1424
api rootProject

0 commit comments

Comments
 (0)