Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test our Gradle plugin against Gradle 7.2

Browse Source 
Closes gh-27732
This commit is contained in:
Andy Wilkinson
2021-08-17 15:58:40 +01:00
parent ea641d3aab
commit b4f0f29bff
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
View File

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

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
View File

@@ -63,7 +63,7 @@ public class GradleMultiDslExtension implements TestTemplateInvocationContextPro
GradleBuild gradleBuild = new GradleBuild(this.dsl);
JavaVersion javaVersion = JavaVersion.current();
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) {
gradleBuild.gradleVersion("7.2-rc-3");
gradleBuild.gradleVersion("7.2");
}
else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {
gradleBuild.gradleVersion("7.0.2");