Skip to content

Commit

Permalink
Merge branch '2.5.x'
Browse files Browse the repository at this point in the history
Closes gh-27733
  • Loading branch information
wilkinsona committed Aug 17, 2021
2 parents 79be076 + b4f0f29 commit 8966b13
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ private GradleVersions() {

public static List<String> allCompatible() {
if (isJava17()) {
return Collections.singletonList("7.2-rc-3");
return Collections.singletonList("7.2");
}
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() {
if (isJava17()) {
return "7.2-rc-3";
return "7.2";
}
if (isJava16()) {
return "7.0.2";
Expand Down

0 comments on commit 8966b13

Please sign in to comment.