From ae7fe3b4d209731a1bde8828fbb30c36b589e073 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Tue, 18 Feb 2020 13:45:19 +0100 Subject: [PATCH 1/2] Upgrade to Gradle 6.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1b16c34a71cf..b7c8c5dbf583 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 27f3cbe78455e26f443ddf4e9aa91805fefe2251 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Tue, 18 Feb 2020 13:47:02 +0100 Subject: [PATCH 2/2] Update versions to test against in Gradle Plugin --- .../boot/gradle/junit/GradleCompatibilityExtension.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 9b00ad493384..22818ad65a96 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 @@ -43,10 +43,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio static { if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) { - GRADLE_VERSIONS = Arrays.asList("6.0.1", "default"); + GRADLE_VERSIONS = Arrays.asList("6.0.1", "6.1.1", "default"); } else { - GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.0.1", "default"); + GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.0.1", "6.1.1", "default"); } }