Skip to content

Commit c7fd075

Browse files
wilkinsonawilkinsona
committed
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
1 parent 1a858a2 commit c7fd075

File tree

14 files changed

+16
-16
lines changed

14 files changed

+16
-16
lines changed

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
dependencies {
99
classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
1010
classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
11-
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.2.1'
11+
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5'
1212
}
1313
}
1414

‎buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ public class SampleBuildConfigurer {
116116
}
117117

118118
private Task createGradleBuild(Project project, Object... dependencies) {
119-
Task gradleBuild = project.tasks.create("${name}Gradle", GradleBuild)
119+
Task gradleBuild = project.tasks.create("${name}Gradle", Exec)
120120
gradleBuild.description = "Builds the ${name} sample with Gradle"
121121
gradleBuild.group = "Build"
122-
gradleBuild.dir = this.workingDir
123-
gradleBuild.tasks = ['clean', 'build']
122+
gradleBuild.workingDir = this.workingDir
123+
gradleBuild.commandLine = [isWindows() ? "${sampleDir.absolutePath}/gradlew.bat" : './gradlew', 'clean', 'build']
124124
gradleBuild.dependsOn dependencies
125125
return gradleBuild
126126
}

‎gradle/wrapper/gradle-wrapper.jar

0 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Mar 23 11:47:38 GMT 2017
1+
#Mon Nov 06 19:55:29 GMT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

‎samples/junit5/gradle/wrapper/gradle-wrapper.jar

0 Bytes
Binary file not shown.

‎samples/junit5/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Mar 23 11:52:19 GMT 2017
1+
#Mon Nov 06 19:55:51 GMT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

‎samples/rest-notes-slate/gradle/wrapper/gradle-wrapper.jar

0 Bytes
Binary file not shown.

‎samples/rest-notes-slate/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Mar 23 11:51:47 GMT 2017
1+
#Mon Nov 06 19:56:00 GMT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

‎samples/rest-notes-spring-hateoas/gradle/wrapper/gradle-wrapper.jar

0 Bytes
Binary file not shown.

‎samples/rest-notes-spring-hateoas/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Mar 23 11:52:07 GMT 2017
1+
#Mon Nov 06 19:56:10 GMT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

‎samples/testng/gradle/wrapper/gradle-wrapper.jar

0 Bytes
Binary file not shown.

‎samples/testng/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Mar 23 11:52:19 GMT 2017
1+
#Mon Nov 06 19:56:16 GMT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

‎samples/web-test-client/gradle/wrapper/gradle-wrapper.jar

0 Bytes
Binary file not shown.

‎samples/web-test-client/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Mar 23 11:48:10 GMT 2017
1+
#Mon Nov 06 19:56:25 GMT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

0 commit comments

Comments
 (0)