Merge branch '2.5.x' into 2.6.x

Closes gh-30509
This commit is contained in:
Stephane Nicoll 2022-04-03 09:32:39 +02:00
commit b2a4ae38e8

View File

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