Skip to content

Commit fbba2df

Browse files
Enable Gradle plugin tests on Java 20
Closes gh-35931
1 parent 0fd1c89 commit fbba2df

File tree

2 files changed

+10
-1
lines changed
  • spring-boot-project/spring-boot-tools

2 files changed

+10
-1
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,5 @@ artifacts {
136136
}
137137

138138
toolchain {
139-
maximumCompatibleJavaVersion = JavaLanguageVersion.of(18)
139+
maximumCompatibleJavaVersion = JavaLanguageVersion.of(20)
140140
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Arrays;
2020
import java.util.List;
2121

22+
import org.gradle.api.JavaVersion;
2223
import org.gradle.util.GradleVersion;
2324

2425
/**
@@ -31,12 +32,20 @@ public final class GradleVersions {
3132
private GradleVersions() {
3233
}
3334

35+
@SuppressWarnings("UnstableApiUsage")
3436
public static List<String> allCompatible() {
37+
if (isJavaVersion(JavaVersion.VERSION_20)) {
38+
return Arrays.asList("8.1.1", "8.2-rc-1");
39+
}
3540
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.1.1", "8.2-rc-1");
3641
}
3742

3843
public static String minimumCompatible() {
3944
return allCompatible().get(0);
4045
}
4146

47+
private static boolean isJavaVersion(JavaVersion version) {
48+
return JavaVersion.current().isCompatibleWith(version);
49+
}
50+
4251
}

0 commit comments

Comments
 (0)