Merge branch '2.5.x'

Closes gh-26905
This commit is contained in:
Andy Wilkinson
2021-06-14 21:02:19 +01:00

View File

@@ -48,10 +48,10 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
static {
JavaVersion javaVersion = JavaVersion.current();
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {
GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1-rc-2");
GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1");
}
else {
GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1-rc-2");
GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1");
}
}