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

Merge pull request #26420 from dreis2211 

* pr/26420:
  Test our Gradle Plugin against Gradle 7.0.1

Closes gh-26420
This commit is contained in:
Stephane Nicoll 2021-05-11 08:25:37 +02:00
parent 87d8aedd3c ba2a4781d2
commit 8ff07a8185
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,10 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
static { static {
JavaVersion javaVersion = JavaVersion.current(); JavaVersion javaVersion = JavaVersion.current();
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) { if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {
GRADLE_VERSIONS = Arrays.asList("7.0"); GRADLE_VERSIONS = Arrays.asList("7.0.1");
} }
else { else {
GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0"); GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.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_16)) { if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {
gradleBuild.gradleVersion("7.0"); gradleBuild.gradleVersion("7.0.1");
} }
return Arrays.asList(new GradleBuildFieldSetter(gradleBuild), new GradleBuildExtension()); return Arrays.asList(new GradleBuildFieldSetter(gradleBuild), new GradleBuildExtension());
} }