From ebcc2ef052b4b5165c9c5ee62de22479f7f715b9 Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler.benson@datadoghq.com>
Date: Tue, 18 Sep 2018 11:04:31 +1000
Subject: [PATCH] Add work around for scala compile issue.

---
 .../instrumentation/java-concurrent/java-concurrent.gradle   | 5 +++++
 dd-java-agent/instrumentation/play-2.4/play-2.4.gradle       | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle b/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle
index 5b12ac9edb..255ba26aa0 100644
--- a/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle
+++ b/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')
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 1014bab501..c050b33e13 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
@@ -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'