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

Upgrade gradle to 4.10.1

dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle

@@ -12,6 +12,11 @@ compileSlickTestGroovy {
   dependsOn compileSlickTestScala
 }
 
+// Work around for https://github.com/gradle/gradle/issues/6735. Remove on gradle >4.10.1
+compileSlickTestScala {
+  analysisFiles.setFrom(files())
+}
+
 dependencies {
   compile project(':dd-trace-api')
   compile project(':dd-java-agent:agent-tooling')

dd-java-agent/instrumentation/play-2.4/play-2.4.gradle

@@ -20,6 +20,11 @@ muzzle {
   }
 }
 
+// Work around for https://github.com/gradle/gradle/issues/6735. Remove on gradle >4.10.1
+compileLatestDepTestScala {
+  analysisFiles.setFrom(files())
+}
+
 dependencies {
   compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0'
 

dd-trace-java.gradle

@@ -53,7 +53,7 @@ buildScan {
   }
 }
 
-ext.gradleWrapperVersion = '4.9'
+ext.gradleWrapperVersion = '4.10.1'
 task wrapper(type: Wrapper) {
   gradleVersion = gradleWrapperVersion
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists