root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Test our Gradle plugin against Gradle 7.3.1 

Closes gh-28890
This commit is contained in:
Andy Wilkinson 2021-12-02 10:29:22 +00:00
parent b2a1994f7d
commit af60a8a7cf
2 changed files with 4 additions and 4 deletions
Show Stats 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 { static {
JavaVersion javaVersion = JavaVersion.current(); JavaVersion javaVersion = JavaVersion.current();
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) { if (javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) {
GRADLE_VERSIONS = Arrays.asList("7.2", "7.3"); GRADLE_VERSIONS = Arrays.asList("7.2", "7.3.1");
} }
else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) { else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {
GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1.1", "7.2", "7.3"); GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1.1", "7.2", "7.3.1");
} }
else { else {
GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1.1", "7.2", "7.3"); GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1.1", "7.2", "7.3.1");
} }
} }

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); GradleBuild gradleBuild = new GradleBuild(this.dsl);
JavaVersion javaVersion = JavaVersion.current(); JavaVersion javaVersion = JavaVersion.current();
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) { if (javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) {
gradleBuild.gradleVersion("7.3"); gradleBuild.gradleVersion("7.3.1");
} }
else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) { else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {
gradleBuild.gradleVersion("7.0.2"); gradleBuild.gradleVersion("7.0.2");