Merge pull request #162 from DataDog/tyler/upgrade-gradle

tylerbenson · web-flow · commit 50c8c0268a57 · 2017-12-06T08:05:53.000-08:00
Upgrade gradle version to latest.
diff --git a/buildSrc/src/main/groovy/VersionScanPlugin.groovy b/buildSrc/src/main/groovy/VersionScanPlugin.groovy
@@ -243,7 +243,8 @@ class VersionScanPlugin implements Plugin<Project> {
         version.contains("beta") ||
         version.contains("-b") ||
         version.contains(".m") ||
-        version.contains("-dev")
+        version.contains("-dev") ||
+        version.contains("public_draft")
     }
     return list
   }
diff --git a/dd-trace-examples/async-tracing/async-tracing.gradle b/dd-trace-examples/async-tracing/async-tracing.gradle
@@ -13,5 +13,5 @@ dependencies {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '4.0'
+  gradleVersion = gradleWrapperVersion
 }
diff --git a/dd-trace-examples/async-tracing/gradle/wrapper/gradle-wrapper.jar b/dd-trace-examples/async-tracing/gradle/wrapper/gradle-wrapper.jar
diff --git a/dd-trace-examples/async-tracing/gradle/wrapper/gradle-wrapper.properties b/dd-trace-examples/async-tracing/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jul 21 16:12:09 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
diff --git a/dd-trace-examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle b/dd-trace-examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle
@@ -36,5 +36,5 @@ shadowJar {
 
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '4.0'
+  gradleVersion = gradleWrapperVersion
 }
diff --git a/dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar b/dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar
diff --git a/dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties b/dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jul 21 16:12:09 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
diff --git a/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.jar b/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.jar
diff --git a/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.properties b/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Jul 31 16:10:41 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
diff --git a/dd-trace-examples/rest-spark/rest-spark.gradle b/dd-trace-examples/rest-spark/rest-spark.gradle
@@ -37,5 +37,5 @@ shadowJar {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '4.0'
+  gradleVersion = gradleWrapperVersion
 }
diff --git a/dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar b/dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar
diff --git a/dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.properties b/dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jul 21 16:12:09 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
diff --git a/dd-trace-examples/spring-boot-jdbc/spring-boot-jdbc.gradle b/dd-trace-examples/spring-boot-jdbc/spring-boot-jdbc.gradle
@@ -29,5 +29,5 @@ bootRun {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '4.0'
+  gradleVersion = gradleWrapperVersion
 }
diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle
@@ -30,6 +30,7 @@ description = 'dd-trace-java'
 // Applied here to allow publishing of artifactory build info
 apply from: "${rootDir}/gradle/publish.gradle"
 
+ext.gradleWrapperVersion = '4.3.1'
 task wrapper(type: Wrapper) {
-  gradleVersion = '4.0'
+  gradleVersion = gradleWrapperVersion
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Jul 06 17:54:32 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,8 @@ class VersionScanPlugin implements Plugin<Project> {`
`243`	`243`	`version.contains("beta") \|\|`
`244`	`244`	`version.contains("-b") \|\|`
`245`	`245`	`version.contains(".m") \|\|`
`246`		`- version.contains("-dev")`
	`246`	`+ version.contains("-dev") \|\|`
	`247`	`+ version.contains("public_draft")`
`247`	`248`	`}`
`248`	`249`	`return list`
`249`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ dependencies {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`task wrapper(type: Wrapper) {`
`16`		`- gradleVersion = '4.0'`
	`16`	`+ gradleVersion = gradleWrapperVersion`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,5 @@ shadowJar {`
`36`	`36`
`37`	`37`
`38`	`38`	`task wrapper(type: Wrapper) {`
`39`		`- gradleVersion = '4.0'`
	`39`	`+ gradleVersion = gradleWrapperVersion`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,5 @@ shadowJar {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`task wrapper(type: Wrapper) {`
`40`		`- gradleVersion = '4.0'`
	`40`	`+ gradleVersion = gradleWrapperVersion`
`41`	`41`	`}`