Browse Source

Merge branch '3.4.x'

Closes gh-45694
pull/45705/head
Andy Wilkinson 8 months ago
parent
commit
5f591b376f
  1. 4
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
  2. 5
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

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

@ -154,7 +154,3 @@ plugins.withType(EclipsePlugin) { @@ -154,7 +154,3 @@ plugins.withType(EclipsePlugin) {
}
}
}
toolchain {
maximumCompatibleJavaVersion = JavaLanguageVersion.of(23)
}

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

@ -33,9 +33,12 @@ public final class GradleVersions { @@ -33,9 +33,12 @@ public final class GradleVersions {
}
public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_23)) {
if (isJavaVersion(JavaVersion.VERSION_24)) {
return Arrays.asList(GradleVersion.current().getVersion());
}
if (isJavaVersion(JavaVersion.VERSION_23)) {
return Arrays.asList("8.10", GradleVersion.current().getVersion());
}
if (isJavaVersion(JavaVersion.VERSION_22)) {
return Arrays.asList("8.8", GradleVersion.current().getVersion());
}

Loading…
Cancel
Save