Merge branch '2.5.x'

Closes gh-27365
This commit is contained in:
Andy Wilkinson
2021-07-16 11:48:41 +01:00
9 changed files with 155 additions and 10 deletions

View File

@@ -17,6 +17,7 @@
package org.springframework.boot.testsupport.gradle.testkit;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.gradle.api.JavaVersion;
@@ -33,6 +34,9 @@ public final class GradleVersions {
}
public static List<String> allCompatible() {
if (isJava17()) {
return Collections.emptyList();
}
if (isJava16()) {
return Arrays.asList("7.0.2", "7.1");
}
@@ -46,6 +50,10 @@ public final class GradleVersions {
return GradleVersion.current().getVersion();
}
private static boolean isJava17() {
return JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17);
}
private static boolean isJava16() {
return JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16);
}