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
This commit is contained in:
Andy Wilkinson
2017-11-06 20:42:36 +00:00
parent 1a858a2e1f
commit c7fd07576b
14 changed files with 16 additions and 16 deletions

View File

@@ -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'
}
}

View File

@@ -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
}

Binary file not shown.

View File

@@ -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

Binary file not shown.

View File

@@ -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

View File

@@ -1,6 +1,6 @@
#Thu Mar 23 11:51:47 GMT 2017
#Mon Nov 06 19:56:00 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

View File

@@ -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

Binary file not shown.

View File

@@ -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

View File

@@ -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