Merge branch '2.5.x'

Closes gh-27733
pull/27736/head
Andy Wilkinson 3 years ago
commit 8966b1308b

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

Loading…
Cancel
Save