Merge branch '2.7.x' into 3.0.x

Closes gh-36226
This commit is contained in:
Andy Wilkinson 2023-07-05 08:52:55 +01:00
commit cbc0f7117f
1 changed files with 2 additions and 2 deletions

View File

@ -35,9 +35,9 @@ public final class GradleVersions {
@SuppressWarnings("UnstableApiUsage") @SuppressWarnings("UnstableApiUsage")
public static List<String> allCompatible() { public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_20)) { if (isJavaVersion(JavaVersion.VERSION_20)) {
return Arrays.asList("8.1.1", "8.2-rc-1"); return Arrays.asList("8.1.1", "8.2");
} }
return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.1.1", "8.2-rc-1"); return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.2");
} }
public static String minimumCompatible() { public static String minimumCompatible() {