root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x 

Closes gh-31754
This commit is contained in:
Andy Wilkinson 2022-07-14 17:28:54 +01:00
parent 186f93c3cb 8c4708982b
commit 9c250cae92
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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() {