From ba164fc6df75fa2135675b2aaac44ba15b10d957 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 6 Feb 2018 12:34:50 +0100 Subject: [PATCH] Upgrade to Gradle 4.5.1 Closes gh-589 --- .../gradle4/gradle/wrapper/gradle-wrapper.jar | Bin 54712 -> 54711 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../main/resources/project/gradle4/gradlew | 6 +++--- .../generator/ProjectGeneratorTests.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/initializr-generator/src/main/resources/project/gradle4/gradle/wrapper/gradle-wrapper.jar b/initializr-generator/src/main/resources/project/gradle4/gradle/wrapper/gradle-wrapper.jar index 4cb35010ba5a9d9999a5415bc8fa9215039039d0..1ce6e58f1ce8ae3a3be37719a2180b5567cea91d 100644 GIT binary patch delta 4221 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 diff --git a/initializr-generator/src/main/resources/project/gradle4/gradle/wrapper/gradle-wrapper.properties b/initializr-generator/src/main/resources/project/gradle4/gradle/wrapper/gradle-wrapper.properties index a39b340e..44d9d03d 100644 --- a/initializr-generator/src/main/resources/project/gradle4/gradle/wrapper/gradle-wrapper.properties +++ b/initializr-generator/src/main/resources/project/gradle4/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jul 28 13:37:07 BST 2017 +#Tue Feb 06 12:27:20 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip diff --git a/initializr-generator/src/main/resources/project/gradle4/gradlew b/initializr-generator/src/main/resources/project/gradle4/gradlew index cccdd3d5..4453ccea 100755 --- a/initializr-generator/src/main/resources/project/gradle4/gradlew +++ b/initializr-generator/src/main/resources/project/gradle4/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn () { +warn ( ) { echo "$*" } -die () { +die ( ) { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save () { +save ( ) { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java index cbb8ea33..d3526655 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java @@ -353,7 +353,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests { ProjectRequest request = createProjectRequest("web"); request.setType("gradle-project"); request.setBootVersion("2.0.0.M4"); - generateProject(request).isGradleProject("4.2"); + generateProject(request).isGradleProject("4.5.1"); } @Test @@ -361,7 +361,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests { ProjectRequest request = createProjectRequest("web"); request.setType("gradle-project"); request.setBootVersion("2.0.0.BUILD-SNAPSHOT"); - generateProject(request).isGradleProject("4.2"); + generateProject(request).isGradleProject("4.5.1"); } @Test