diff --git a/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle b/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle index 17c28aba66..41a57731c8 100644 --- a/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle +++ b/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle @@ -6,7 +6,7 @@ excludedClassesConverage += ['*'] dependencies { testCompile project(':dd-trace-api') testCompile project(':dd-trace-ot') - testCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12' + testCompile deps.scala testCompile group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.3.16' testCompile group: 'com.typesafe.akka', name: 'akka-testkit_2.11', version: '2.3.16' diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle b/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle index facc5f16a2..b679a53c46 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle +++ b/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle @@ -34,7 +34,7 @@ dependencies { slickTestCompile project(':dd-java-agent:instrumentation:java-concurrent') slickTestCompile project(':dd-java-agent:instrumentation:trace-annotation') slickTestCompile project(':dd-java-agent:instrumentation:jdbc') - slickTestCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12' + slickTestCompile deps.scala slickTestCompile group: 'com.typesafe.slick', name: 'slick_2.11', version: '3.2.0' slickTestCompile group: 'com.h2database', name: 'h2', version: '1.4.197' } diff --git a/dd-java-agent/instrumentation/java-concurrent/scala-testing/scala-testing.gradle b/dd-java-agent/instrumentation/java-concurrent/scala-testing/scala-testing.gradle index 9d00b3959d..53ac0a4e76 100644 --- a/dd-java-agent/instrumentation/java-concurrent/scala-testing/scala-testing.gradle +++ b/dd-java-agent/instrumentation/java-concurrent/scala-testing/scala-testing.gradle @@ -4,7 +4,7 @@ apply from: "${rootDir}/gradle/test-with-scala.gradle" dependencies { testCompile project(':dd-trace-api') testCompile project(':dd-trace-ot') - testCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12' + testCompile deps.scala testCompile project(':dd-java-agent:testing') testCompile project(':dd-java-agent:instrumentation:java-concurrent') diff --git a/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle b/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle index f955798638..e5ed670ecd 100644 --- a/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle +++ b/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle @@ -35,7 +35,7 @@ dependencies { annotationProcessor deps.autoservice implementation deps.autoservice - testCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12' + testCompile deps.scala testCompile group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0' testCompile group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.4.0' testCompile project(':dd-java-agent:testing') @@ -44,7 +44,7 @@ dependencies { testCompile project(':dd-java-agent:instrumentation:akka-http-10.0') testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' - latestDepTestCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12' + latestDepTestCompile deps.scala latestDepTestCompile group: 'com.typesafe.play', name: 'play_2.11', version: '2.6.0' latestDepTestCompile group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.6.0' } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 5f84e0f8c7..c54acb41d7 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -16,6 +16,7 @@ ext { logback : "1.2.3", lombok : "1.18.2", bytebuddy : "1.9.3", + scala : "2.11.12", ] deps = [ @@ -57,5 +58,6 @@ ext { dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: versions.slf4j), dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: versions.slf4j), ], + scala : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"), ] }