Fix usage of deprecated field in AndroidGradleUtils (#10710)

daniel-mohedano · web-flow · commit 6ece63b6df25 · 2026-03-02T14:03:17.000Z
fix: remove deprecated fields

fix: remove kotlin fix for now

Co-authored-by: daniel.mohedano &lt;daniel.mohedano@datadoghq.com&gt;
diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/AndroidGradleUtils.groovy b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/AndroidGradleUtils.groovy
@@ -97,9 +97,15 @@ class AndroidGradleUtils {
   }
 
   private static getJavaDestinations(variant) {
+    def javaCompileTask
     if (variant.hasProperty('javaCompileProvider')) {
-      return variant.javaCompileProvider.get().destinationDir
+      javaCompileTask = variant.javaCompileProvider.get()
+    } else {
+      javaCompileTask = variant.javaCompile
+    }
+    if (javaCompileTask.hasProperty('destinationDirectory')) {
+      return javaCompileTask.destinationDirectory.asFile.get()
     }
-    return variant.javaCompile.destinationDir
+    return javaCompileTask.destinationDir
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,15 @@ class AndroidGradleUtils {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`private static getJavaDestinations(variant) {`
	`100`	`+ def javaCompileTask`
`100`	`101`	`if (variant.hasProperty('javaCompileProvider')) {`
`101`		`- return variant.javaCompileProvider.get().destinationDir`
	`102`	`+ javaCompileTask = variant.javaCompileProvider.get()`
	`103`	`+ } else {`
	`104`	`+ javaCompileTask = variant.javaCompile`
	`105`	`+ }`
	`106`	`+ if (javaCompileTask.hasProperty('destinationDirectory')) {`
	`107`	`+ return javaCompileTask.destinationDirectory.asFile.get()`
`102`	`108`	`}`
`103`		`- return variant.javaCompile.destinationDir`
	`109`	`+ return javaCompileTask.destinationDir`
`104`	`110`	`}`
`105`	`111`	`}`