Browse Source

Upgrade to Gradle 6.1

Closes gh-19772
pull/19789/head
Andy Wilkinson 6 years ago
parent
commit
9d5975bd09
  1. 2
      gradle/wrapper/gradle-wrapper.properties
  2. 5
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java

2
gradle/wrapper/gradle-wrapper.properties vendored

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

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

@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
package org.springframework.boot.gradle.junit;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;
@ -44,10 +43,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio @@ -44,10 +43,10 @@ public final class GradleCompatibilityExtension implements TestTemplateInvocatio
static {
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
GRADLE_VERSIONS = Collections.singletonList("default");
GRADLE_VERSIONS = Arrays.asList("6.0.1", "default");
}
else {
GRADLE_VERSIONS = Arrays.asList("5.6.4", "default");
GRADLE_VERSIONS = Arrays.asList("5.6.4", "6.0.1", "default");
}
}

Loading…
Cancel
Save