From ba2a4781d228d1b8a339b9adfcf247b05e3902f6 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Mon, 10 May 2021 19:36:17 +0200 Subject: [PATCH] Test our Gradle Plugin against Gradle 7.0.1 See gh-26420 --- .../boot/gradle/junit/GradleCompatibilityExtension.java | 4 ++-- .../boot/gradle/junit/GradleMultiDslExtension.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java index 4f5993ae59a..b8f9619d7bb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java @@ -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"); + GRADLE_VERSIONS = Arrays.asList("7.0.1"); } else { - GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0"); + GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.1"); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java index 624bf67d603..55085d3d92d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java +++ b/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 GradleBuild gradleBuild = new GradleBuild(this.dsl); JavaVersion javaVersion = JavaVersion.current(); if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) { - gradleBuild.gradleVersion("7.0"); + gradleBuild.gradleVersion("7.0.1"); } return Arrays.asList(new GradleBuildFieldSetter(gradleBuild), new GradleBuildExtension()); }