Merge branch '2.6.x' into 2.7.x

Closes gh-29173
This commit is contained in:
Stephane Nicoll 2021-12-25 09:55:38 +01:00
commit eb81cbf053

View File

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