From c7fd07576bb963fd6c8df96fe6af21bf9c923dfe Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 6 Nov 2017 20:42:36 +0000 Subject: [PATCH] Build with Gradle 4.3 where possible Upgrade the main build and all the Gradle-based samples other than the Gradle sample to Gradle 4.3. Closes gh-446 --- build.gradle | 2 +- .../build/SampleBuildConfigurer.groovy | 6 +++--- gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 54212 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../junit5/gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 54212 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 54212 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 54212 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../testng/gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 54212 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 54212 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index b7e1dd13..9283b530 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7' classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE' - classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.2.1' + classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5' } } diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy index 39eb3bad..5cc0fefd 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy @@ -116,11 +116,11 @@ public class SampleBuildConfigurer { } private Task createGradleBuild(Project project, Object... dependencies) { - Task gradleBuild = project.tasks.create("${name}Gradle", GradleBuild) + Task gradleBuild = project.tasks.create("${name}Gradle", Exec) gradleBuild.description = "Builds the ${name} sample with Gradle" gradleBuild.group = "Build" - gradleBuild.dir = this.workingDir - gradleBuild.tasks = ['clean', 'build'] + gradleBuild.workingDir = this.workingDir + gradleBuild.commandLine = [isWindows() ? "${sampleDir.absolutePath}/gradlew.bat" : './gradlew', 'clean', 'build'] gradleBuild.dependsOn dependencies return gradleBuild } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7d18717c6bd02fd36aad26b24c1a594d6a8a6dea..dddb02e2ce40fb822d8c08a620f1ed3a708ef31b 100644 GIT binary patch delta 28 hcmX@IocYLd<_)ojSl-P`^WL0zNLUcenp|<&2LQ!w4N?FA delta 28 hcmX@IocYLd<_)ojSU$&=du>iUBrFJKO|H1?0|3D}4Eg{7 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cd1f40f5..8b72fb0a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 23 11:47:38 GMT 2017 +#Mon Nov 06 19:55:29 GMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip diff --git a/samples/junit5/gradle/wrapper/gradle-wrapper.jar b/samples/junit5/gradle/wrapper/gradle-wrapper.jar index afc752b63755cfdf1ea6f10763bb78853284e9aa..dac656310182b44e2d3455888afa40a99aa35f29 100644 GIT binary patch delta 28 hcmX@IocYLd<_)ojSbok+^WL0zNLUcenp|<&2LQ&44QK!W delta 28 hcmX@IocYLd<_)ojSUTg%y*4Kv5*7rrCRbec0RXm*3@88q diff --git a/samples/junit5/gradle/wrapper/gradle-wrapper.properties b/samples/junit5/gradle/wrapper/gradle-wrapper.properties index 816de9ef..157a86c9 100644 --- a/samples/junit5/gradle/wrapper/gradle-wrapper.properties +++ b/samples/junit5/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 23 11:52:19 GMT 2017 +#Mon Nov 06 19:55:51 GMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip diff --git a/samples/rest-notes-slate/gradle/wrapper/gradle-wrapper.jar b/samples/rest-notes-slate/gradle/wrapper/gradle-wrapper.jar index e2bce308910aa4f94d41c636d79b210847773313..63b8d3678422c2faa747e951ccaf87df26db2eef 100644 GIT binary patch delta 28 hcmX@IocYLd<_)ojSQzG~d2dcUBrFJKO|H1?0|2dA3wQtk delta 28 hcmX@IocYLd<_)ojSjywdy*4Kv5*7rrCRbec0RXhQ3*Le diff --git a/samples/rest-notes-spring-hateoas/gradle/wrapper/gradle-wrapper.properties b/samples/rest-notes-spring-hateoas/gradle/wrapper/gradle-wrapper.properties index 785a1992..f2585ee7 100644 --- a/samples/rest-notes-spring-hateoas/gradle/wrapper/gradle-wrapper.properties +++ b/samples/rest-notes-spring-hateoas/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 23 11:52:07 GMT 2017 +#Mon Nov 06 19:56:10 GMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip diff --git a/samples/testng/gradle/wrapper/gradle-wrapper.jar b/samples/testng/gradle/wrapper/gradle-wrapper.jar index afc752b63755cfdf1ea6f10763bb78853284e9aa..cd5c388daf20705fee245c7fd02409bbcd3b6c80 100644 GIT binary patch delta 28 hcmX@IocYLd<_)ojSUBdVd2dcUBrFJKO|H1?0|2fm3y1&! delta 28 hcmX@IocYLd<_)ojSUTg%y*4Kv5*7rrCRbec0RXm*3@88q diff --git a/samples/testng/gradle/wrapper/gradle-wrapper.properties b/samples/testng/gradle/wrapper/gradle-wrapper.properties index 816de9ef..2ba17656 100644 --- a/samples/testng/gradle/wrapper/gradle-wrapper.properties +++ b/samples/testng/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 23 11:52:19 GMT 2017 +#Mon Nov 06 19:56:16 GMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip diff --git a/samples/web-test-client/gradle/wrapper/gradle-wrapper.jar b/samples/web-test-client/gradle/wrapper/gradle-wrapper.jar index 98b249f0d266ceb66fff67fecd3e3cbfcc0b4b56..a8839542f8aee9a965763ac4d1d646d535200ca0 100644 GIT binary patch delta 28 hcmX@IocYLd<_)ojSa{~Ad2dcUBrFJKO|H1?0|2g(3y=T+ delta 28 hcmX@IocYLd<_)ojSXkrAy*4Kv5*7rrCRbec0RX8b3m^ah diff --git a/samples/web-test-client/gradle/wrapper/gradle-wrapper.properties b/samples/web-test-client/gradle/wrapper/gradle-wrapper.properties index fff42c29..64b23251 100644 --- a/samples/web-test-client/gradle/wrapper/gradle-wrapper.properties +++ b/samples/web-test-client/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 23 11:48:10 GMT 2017 +#Mon Nov 06 19:56:25 GMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip