Browse Source

Merge branch '2.6.x' into 2.7.x

Closes gh-31754
pull/32861/head
Andy Wilkinson 3 years ago
parent
commit
9c250cae92
  1. 9
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

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

@ -34,15 +34,16 @@ public final class GradleVersions { @@ -34,15 +34,16 @@ public final class GradleVersions {
public static List<String> allCompatible() {
if (isJava18()) {
return Arrays.asList("7.3.3", "7.4.2");
return Arrays.asList("7.3.3", "7.4.2", "7.5");
}
if (isJava17()) {
return Arrays.asList("7.2", "7.3.3", "7.4.2");
return Arrays.asList("7.2", "7.3.3", "7.4.2", "7.5");
}
if (isJava16()) {
return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.3", "7.4.2");
return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.3", "7.4.2", "7.5");
}
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.3", "7.4.2");
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.3", "7.4.2",
"7.5");
}
public static String currentOrMinimumCompatible() {

Loading…
Cancel
Save