Skip to content

Commit

Permalink
Merge branch '2.5.x' into 2.6.x
Browse files Browse the repository at this point in the history
Closes gh-30141
  • Loading branch information
wilkinsona committed Mar 9, 2022
2 parents a31135e + 5264fb3 commit 382c697
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ private GradleVersions() {

public static List<String> allCompatible() {
if (isJava18()) {
return Arrays.asList("7.3.3", "7.4");
return Arrays.asList("7.3.3", "7.4.1");
}
if (isJava17()) {
return Arrays.asList("7.2", "7.3.3", "7.4");
return Arrays.asList("7.2", "7.3.3", "7.4.1");
}
if (isJava16()) {
return Arrays.asList("7.0.2", "7.1", "7.2", "7.3.3", "7.4");
return Arrays.asList("7.0.2", "7.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");
return Arrays.asList("6.8.3", GradleVersion.current().getVersion(), "7.0.2", "7.1.1", "7.2", "7.3.3", "7.4.1");
}

public static String currentOrMinimumCompatible() {
Expand Down

0 comments on commit 382c697

Please sign in to comment.