Browse Source

Test our Gradle plugin against 7.2-rc-2

Closes gh-27593
pull/28375/head
Andy Wilkinson 5 years ago
parent
commit
7610fe02c5
  1. 6
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
  2. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java

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

@ -48,13 +48,13 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex @@ -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-1");
GRADLE_VERSIONS = Arrays.asList("7.2-rc-2");
}
else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {
GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1.1", "7.2-rc-1");
GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1.1", "7.2-rc-2");
}
else {
GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1.1", "7.2-rc-1");
GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1.1", "7.2-rc-2");
}
}

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

@ -63,7 +63,7 @@ public class GradleMultiDslExtension implements TestTemplateInvocationContextPro @@ -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-1");
gradleBuild.gradleVersion("7.2-rc-2");
}
else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {
gradleBuild.gradleVersion("7.0.2");

Loading…
Cancel
Save