Merge pull request #1186 from DataDog/mar-kolya/update-gradle

Update gradle

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

@@ -7,7 +7,6 @@
 
 apply from: "${rootDir}/gradle/java.gradle"
 apply from: "${rootDir}/gradle/test-with-scala.gradle"
-apply from: "${rootDir}/gradle/test-with-kotlin.gradle"
 
 apply plugin: 'org.unbroken-dome.test-sets'
 
@@ -16,8 +15,7 @@ testSets {
 }
 
 compileSlickTestGroovy {
-  classpath = classpath.plus(files(compileSlickTestScala.destinationDir))
-  dependsOn compileSlickTestScala
+  classpath += files(sourceSets.slickTest.scala.classesDirectory)
 }
 
 dependencies {

dd-trace-java.gradle

@@ -9,7 +9,7 @@ plugins {
   // Not applying google java format by default because it gets confused by stray java build
   // files in 'workspace' build directory in CI
   id 'com.github.sherter.google-java-format' version '0.8' apply false
-  id 'com.dorongold.task-tree' version '1.4'
+  id 'com.dorongold.task-tree' version '1.5'
 }
 
 def isCI = System.getenv("CI") != null

gradle/dependencies.gradle

@@ -17,7 +17,7 @@ ext {
     lombok     : "1.18.10",
     bytebuddy  : "1.10.6",
     scala      : "2.11.12",  // Last version to support Java 7 (2.12+ require Java 8+)
-    kotlin     : "1.3.50",
+    kotlin     : "1.3.61",
     coroutines : "1.3.0"
   ]
 

gradle/test-with-kotlin.gradle

@@ -2,6 +2,7 @@
 apply plugin: 'kotlin'
 
 compileTestGroovy {
-  classpath = classpath.plus(files(compileTestKotlin.destinationDir))
-  dependsOn compileTestKotlin
+  //Note: look like it should be `classpath += files(sourceSets.test.kotlin.classesDirectory)`
+  //instead, but kotlin plugin doesn't support it (yet?)
+  classpath += files(compileTestKotlin.destinationDir)
 }

gradle/test-with-scala.gradle

@@ -13,6 +13,5 @@ configurations {
 }
 
 compileTestGroovy {
-  classpath = classpath.plus(files(compileTestScala.destinationDir))
-  dependsOn compileTestScala
+  classpath += files(sourceSets.test.scala.classesDirectory)
 }

gradle/wrapper/gradle-wrapper.properties

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