From 1db8ca60aa158a660ed872bb4cb53588cc030703 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 14 May 2021 13:58:46 +0100 Subject: [PATCH] Test our Gradle plugin against Gradle 7.0.2 Closes gh-26464 --- .../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 b8f9619d7bb..eca46d6f6b6 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.1"); + GRADLE_VERSIONS = Arrays.asList("7.0.2"); } else { - GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.1"); + GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2"); } } 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 55085d3d92d..829e220e1b0 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.1"); + gradleBuild.gradleVersion("7.0.2"); } return Arrays.asList(new GradleBuildFieldSetter(gradleBuild), new GradleBuildExtension()); }