chore: Lazy task access for classpath, removes non-needed dependsOn

bric3 · bric3 · commit 86d9a275ec13 · 2025-10-13T12:51:45.000+02:00
Since the classpath is properly declared the task dependency is not necessary anymore.
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle
@@ -171,31 +171,25 @@ dependencies {
 }
 
 tasks.named("compileBaseTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))
-  dependsOn "compileBaseTestScala"
+  classpath += files(tasks.named('compileBaseTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileBaseForkedTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))
-  dependsOn "compileBaseTestScala"
+  classpath += files(tasks.named('compileBaseTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileVersion101TestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))
-  dependsOn "compileVersion101TestScala"
+  classpath += files(tasks.named('compileVersion101TestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileVersion101ForkedTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))
-  dependsOn "compileVersion101TestScala"
+  classpath += files(tasks.named('compileVersion101TestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileVersion102Scala213TestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileVersion102Scala213TestScala.destinationDirectory))
-  dependsOn "compileVersion102Scala213TestScala"
+  classpath += files(tasks.named('compileVersion102Scala213TestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
-  dependsOn "compileLatestDepTestScala"
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle
@@ -47,14 +47,12 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 tasks.named("compileTestGroovy", GroovyCompile) {
   configureCompiler(it, 11)
-  dependsOn compileTestScala
-  classpath += files(compileTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   configureCompiler(it, 11)
-  dependsOn compileLatestDepTestScala
-  classpath += files(compileLatestDepTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/finatra-2.9/build.gradle b/dd-java-agent/instrumentation/finatra-2.9/build.gradle
@@ -36,15 +36,15 @@ dependencies {
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
   dependsOn "compileLatestDepTestScala"
 }
 
 tasks.named("compileLatestPre207TestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileLatestPre207TestScala.destinationDirectory))
+  classpath += files(tasks.named('compileLatestPre207TestScala').map { it.destinationDirectory })
   dependsOn "compileLatestPre207TestScala"
 }
 
 tasks.named("latestDepTest", Test) {
-  finalizedBy latestPre207Test
+  finalizedBy 'latestPre207Test'
 }
diff --git a/dd-java-agent/instrumentation/jdbc/scalikejdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/scalikejdbc/build.gradle
@@ -12,12 +12,12 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 tasks.named("compileTestGroovy", GroovyCompile) {
   dependsOn "compileTestScala"
-  classpath += files(compileTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   dependsOn "compileLatestDepTestScala"
-  classpath += files(compileLatestDepTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
 
 tasks.withType(ScalaCompile).configureEach {
diff --git a/dd-java-agent/instrumentation/junit/junit-4.10/build.gradle b/dd-java-agent/instrumentation/junit/junit-4.10/build.gradle
@@ -28,7 +28,7 @@ kotlin {
 addTestSuiteForDir('latestDepTest', 'test')
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath += files(compileLatestDepTestKotlin.destinationDirectory)
+  classpath += files(tasks.named('compileLatestDepTestKotlin').map { it.destinationDirectory })
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle
@@ -39,15 +39,15 @@ kotlin {
 addTestSuite('latestDepTest')
 
 tasks.named("compileTestFixturesGroovy", GroovyCompile) {
-  classpath += files(compileTestFixturesKotlin.destinationDirectory)
+  classpath += files(tasks.named('compileTestFixturesKotlin').map { it.destinationDirectory })
 }
 
 tasks.named("compileTestGroovy", GroovyCompile) {
-  classpath += files(compileTestKotlin.destinationDirectory)
+  classpath += files(tasks.named('compileTestKotlin').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath += files(compileLatestDepTestKotlin.destinationDirectory)
+  classpath += files(tasks.named('compileLatestDepTestKotlin').map { it.destinationDirectory })
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle
@@ -118,16 +118,13 @@ tasks.named("latestDepTest", Test) {
 }
 
 tasks.named("compileBaseTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))
-  dependsOn "compileBaseTestScala"
+  classpath += files(tasks.named('compileBaseTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
-  dependsOn "compileLatestDepTestScala"
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestPekko10TestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
-  dependsOn "compileLatestDepTestScala"
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.3/build.gradle b/dd-java-agent/instrumentation/play/play-2.3/build.gradle
@@ -60,6 +60,5 @@ dependencies {
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
-  dependsOn compileLatestDepTestScala
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
diff --git a/dd-java-agent/instrumentation/play/play-2.4/build.gradle b/dd-java-agent/instrumentation/play/play-2.4/build.gradle
@@ -62,9 +62,9 @@ tasks.named("jar", Jar) {
   from sourceSets.main_play25.output
 }
 
-project.afterEvaluate { p ->
-  instrumentJava.dependsOn compileMain_play25Java
-  forbiddenApisMain_play25.dependsOn instrumentMain_play25Java
+project.afterEvaluate {
+  tasks.named('instrumentJava') { dependsOn 'compileMain_play25Java' }
+  tasks.named('forbiddenApisMain_play25') { dependsOn 'instrumentMain_play25Java' }
 }
 
 instrument {
@@ -104,13 +104,11 @@ dependencies {
 }
 
 tasks.named("compileTestGroovy", GroovyCompile) {
-  classpath = classpath + files(compileTestScala.destinationDirectory)
-  dependsOn 'compileTestScala'
+  classpath = classpath + files(tasks.named('compileTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath = classpath + files(compileLatestDepTestScala.destinationDirectory)
-  dependsOn 'compileLatestDepTestScala'
+  classpath = classpath + files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
 
 sourceSets {
@@ -154,50 +152,42 @@ configurations {
     it.mainClass.set 'generator.CompileRoutes'
     it.args routesFile, outputDir.get().asFile.absolutePath
 
-    it.classpath configurations.routeGeneratorRuntimeClasspath
-    it.classpath compileRouteGeneratorScala.destinationDirectory
+    it.classpath configurations.named('routeGeneratorRuntimeClasspath')
+    it.classpath tasks.named('compileRouteGeneratorScala').map { it.destinationDirectory }
 
     if (taskName == 'buildTestRoutes') {
-      it.classpath compileTestScala.destinationDirectory
-      dependsOn compileTestScala
+      it.classpath tasks.named('compileTestScala').map { it.destinationDirectory }
     } else {
-      it.classpath compileLatestDepTestScala.destinationDirectory
-      dependsOn compileLatestDepTestScala
+      it.classpath tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }
     }
-
-    dependsOn compileRouteGeneratorScala
   }
 }
 
 tasks.named("compileTestGeneratedScala", ScalaCompile) {
-  classpath = classpath + files(compileTestScala.destinationDirectory)
-  dependsOn buildTestRoutes, compileLatestDepTestScala
+  classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })
+  dependsOn 'buildTestRoutes', 'compileLatestDepTestScala'
 }
 
 tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) {
-  classpath = classpath + files(compileLatestDepTestScala.destinationDirectory)
-  dependsOn buildLatestDepTestRoutes, compileLatestDepTestScala
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
+  dependsOn 'buildLatestDepTestRoutes'
 }
 
 tasks.named("compileTestGroovy", GroovyCompile) {
-  classpath = classpath +
-    files(compileTestGeneratedScala.destinationDirectory)
-  dependsOn 'compileTestGeneratedScala'
+  classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath = classpath +
-    files(compileLatestDepTestGeneratedScala.destinationDirectory)
-  dependsOn 'compileLatestDepTestGeneratedScala'
+  classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory })
 }
 // do it this way rather than through dependencies {} because
 // latestDepTestImplementation extends testImplementation
 tasks.named("test", Test) {
-  classpath = classpath + files(compileTestGeneratedScala.destinationDirectory)
+  classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory })
 }
 
 tasks.named("latestDepTest", Test) {
-  classpath = classpath + files(compileLatestDepTestGeneratedScala.destinationDirectory)
+  classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory })
 }
 
 tasks.named("forbiddenApisTestGenerated") {
diff --git a/dd-java-agent/instrumentation/play/play-2.6/build.gradle b/dd-java-agent/instrumentation/play/play-2.6/build.gradle
@@ -81,9 +81,9 @@ tasks.named("compileMain_play27Java", JavaCompile) {
   dependsOn(compileJava)
 }
 
-project.afterEvaluate { p ->
-  instrumentJava.dependsOn compileMain_play27Java
-  forbiddenApisMain_play27.dependsOn instrumentMain_play27Java
+project.afterEvaluate {
+  tasks.named('instrumentJava') { dependsOn 'compileMain_play27Java' }
+  tasks.named('forbiddenApisMain_play27') { dependsOn 'instrumentMain_play27Java' }
 }
 
 instrument {
@@ -140,8 +140,7 @@ tasks.named("compileLatestDepTestJava", JavaCompile) {
 
 tasks.named("compileLatestDepTestScala", ScalaCompile) {
   configureCompiler(it, 11)
-  classpath = classpath + files(compileBaseTestJava.destinationDirectory)
-  dependsOn 'compileBaseTestJava'
+  classpath = classpath + files(tasks.named('compileBaseTestJava').map { it.destinationDirectory })
 }
 
 tasks.named("latestDepTest", Test) {
@@ -179,22 +178,20 @@ tasks.register('buildLatestDepTestRoutes', JavaExec) {
   it.inputs.file routesFile
   it.outputs.dir outputDir
 
-  it.mainClass.set 'generator.CompileRoutes'
+  it.mainClass = 'generator.CompileRoutes'
   it.args routesFile, outputDir.get().asFile.absolutePath
 
-  it.classpath configurations.routeGeneratorRuntimeClasspath
-  it.classpath compileRouteGeneratorScala.destinationDirectory
-  it.classpath compileLatestDepTestScala.destinationDirectory
+  it.classpath configurations.named('routeGeneratorRuntimeClasspath')
+  it.classpath tasks.named('compileRouteGeneratorScala').map { it.destinationDirectory }
+  it.classpath tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }
 
-  it.javaLauncher.set getJavaLauncherFor(11)
-
-  dependsOn compileRouteGeneratorScala, compileLatestDepTestScala
+  it.javaLauncher = getJavaLauncherFor(11)
 }
 
 tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) {
   configureCompiler(it, 11)
-  classpath = classpath + files(compileLatestDepTestScala.destinationDirectory)
-  dependsOn buildLatestDepTestRoutes, compileLatestDepTestScala
+  classpath = classpath + files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
+  dependsOn 'buildLatestDepTestRoutes'
 }
 
 tasks.named("forbiddenApisLatestDepTestGenerated") {
@@ -204,14 +201,10 @@ tasks.named("forbiddenApisLatestDepTestGenerated") {
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   configureCompiler(it, 11)
   classpath = classpath +
-    files(compileLatestDepTestScala.destinationDirectory) +
-    files(compileBaseTestGroovy.destinationDirectory) +
-    files(compileBaseTestJava.destinationDirectory) +
-    files(compileLatestDepTestGeneratedScala.destinationDirectory)
-  dependsOn 'compileLatestDepTestScala'
-  dependsOn 'compileBaseTestGroovy'
-  dependsOn 'compileBaseTestJava'
-  dependsOn 'compileLatestDepTestGeneratedScala'
+    files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }) +
+    files(tasks.named('compileBaseTestGroovy').map { it.destinationDirectory }) +
+    files(tasks.named('compileBaseTestJava').map { it.destinationDirectory }) +
+    files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory })
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/slick/build.gradle b/dd-java-agent/instrumentation/slick/build.gradle
@@ -12,12 +12,12 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 tasks.named("compileTestGroovy", GroovyCompile) {
   dependsOn "compileTestScala"
-  classpath += files(compileTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   dependsOn "compileLatestDepTestScala"
-  classpath += files(compileLatestDepTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle b/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle
@@ -31,8 +31,7 @@ apply from: "$rootDir/gradle/test-with-scala.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  dependsOn "compileLatestDepTestScala"
-  classpath += files(compileLatestDepTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
 
 tasks.withType(ScalaCompile).configureEach {
diff --git a/gradle/test-with-kotlin.gradle b/gradle/test-with-kotlin.gradle
@@ -3,7 +3,7 @@ project.pluginManager.withPlugin('kotlin') {
   tasks.named("compileTestGroovy", GroovyCompile) {
     //Note: look like it should be `classpath += files(sourceSets.test.kotlin.classesDirectory)`
     //instead, but kotlin plugin doesn't support it (yet?)
-    classpath += files(compileTestKotlin.destinationDirectory)
+    classpath += files(tasks.named('compileTestKotlin').map { it.destinationDirectory })
   }
 
   // Having Groovy, Kotlin and Java in the same project is a bit problematic

Original file line number	Diff line number	Diff line change
`@@ -171,31 +171,25 @@ dependencies {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`tasks.named("compileBaseTestGroovy", GroovyCompile) {`
`174`		`- classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))`
`175`		`- dependsOn "compileBaseTestScala"`
	`174`	`+ classpath += files(tasks.named('compileBaseTestScala').map { it.destinationDirectory })`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`tasks.named("compileBaseForkedTestGroovy", GroovyCompile) {`
`179`		`- classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))`
`180`		`- dependsOn "compileBaseTestScala"`
	`178`	`+ classpath += files(tasks.named('compileBaseTestScala').map { it.destinationDirectory })`
`181`	`179`	`}`
`182`	`180`
`183`	`181`	`tasks.named("compileVersion101TestGroovy", GroovyCompile) {`
`184`		`- classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))`
`185`		`- dependsOn "compileVersion101TestScala"`
	`182`	`+ classpath += files(tasks.named('compileVersion101TestScala').map { it.destinationDirectory })`
`186`	`183`	`}`
`187`	`184`
`188`	`185`	`tasks.named("compileVersion101ForkedTestGroovy", GroovyCompile) {`
`189`		`- classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))`
`190`		`- dependsOn "compileVersion101TestScala"`
	`186`	`+ classpath += files(tasks.named('compileVersion101TestScala').map { it.destinationDirectory })`
`191`	`187`	`}`
`192`	`188`
`193`	`189`	`tasks.named("compileVersion102Scala213TestGroovy", GroovyCompile) {`
`194`		`- classpath = classpath.plus(files(compileVersion102Scala213TestScala.destinationDirectory))`
`195`		`- dependsOn "compileVersion102Scala213TestScala"`
	`190`	`+ classpath += files(tasks.named('compileVersion102Scala213TestScala').map { it.destinationDirectory })`
`196`	`191`	`}`
`197`	`192`
`198`	`193`	`tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`199`		`- classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))`
`200`		`- dependsOn "compileLatestDepTestScala"`
	`194`	`+ classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })`
`201`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,12 @@ addTestSuiteForDir('latestDepTest', 'test')`
`47`	`47`
`48`	`48`	`tasks.named("compileTestGroovy", GroovyCompile) {`
`49`	`49`	`configureCompiler(it, 11)`
`50`		`- dependsOn compileTestScala`
`51`		`- classpath += files(compileTestScala.destinationDirectory)`
	`50`	`+ classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`55`	`54`	`configureCompiler(it, 11)`
`56`		`- dependsOn compileLatestDepTestScala`
`57`		`- classpath += files(compileLatestDepTestScala.destinationDirectory)`
	`55`	`+ classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -36,15 +36,15 @@ dependencies {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`39`		`- classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))`
	`39`	`+ classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })`
`40`	`40`	`dependsOn "compileLatestDepTestScala"`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`tasks.named("compileLatestPre207TestGroovy", GroovyCompile) {`
`44`		`- classpath = classpath.plus(files(compileLatestPre207TestScala.destinationDirectory))`
	`44`	`+ classpath += files(tasks.named('compileLatestPre207TestScala').map { it.destinationDirectory })`
`45`	`45`	`dependsOn "compileLatestPre207TestScala"`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`tasks.named("latestDepTest", Test) {`
`49`		`- finalizedBy latestPre207Test`
	`49`	`+ finalizedBy 'latestPre207Test'`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,12 @@ addTestSuiteForDir('latestDepTest', 'test')`
`12`	`12`
`13`	`13`	`tasks.named("compileTestGroovy", GroovyCompile) {`
`14`	`14`	`dependsOn "compileTestScala"`
`15`		`- classpath += files(compileTestScala.destinationDirectory)`
	`15`	`+ classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`19`	`19`	`dependsOn "compileLatestDepTestScala"`
`20`		`- classpath += files(compileLatestDepTestScala.destinationDirectory)`
	`20`	`+ classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`tasks.withType(ScalaCompile).configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ kotlin {`
`28`	`28`	`addTestSuiteForDir('latestDepTest', 'test')`
`29`	`29`
`30`	`30`	`tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`31`		`- classpath += files(compileLatestDepTestKotlin.destinationDirectory)`
	`31`	`+ classpath += files(tasks.named('compileLatestDepTestKotlin').map { it.destinationDirectory })`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,15 @@ kotlin {`
`39`	`39`	`addTestSuite('latestDepTest')`
`40`	`40`
`41`	`41`	`tasks.named("compileTestFixturesGroovy", GroovyCompile) {`
`42`		`- classpath += files(compileTestFixturesKotlin.destinationDirectory)`
	`42`	`+ classpath += files(tasks.named('compileTestFixturesKotlin').map { it.destinationDirectory })`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`tasks.named("compileTestGroovy", GroovyCompile) {`
`46`		`- classpath += files(compileTestKotlin.destinationDirectory)`
	`46`	`+ classpath += files(tasks.named('compileTestKotlin').map { it.destinationDirectory })`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`50`		`- classpath += files(compileLatestDepTestKotlin.destinationDirectory)`
	`50`	`+ classpath += files(tasks.named('compileLatestDepTestKotlin').map { it.destinationDirectory })`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -118,16 +118,13 @@ tasks.named("latestDepTest", Test) {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`tasks.named("compileBaseTestGroovy", GroovyCompile) {`
`121`		`- classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))`
`122`		`- dependsOn "compileBaseTestScala"`
	`121`	`+ classpath += files(tasks.named('compileBaseTestScala').map { it.destinationDirectory })`
`123`	`122`	`}`
`124`	`123`
`125`	`124`	`tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`126`		`- classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))`
`127`		`- dependsOn "compileLatestDepTestScala"`
	`125`	`+ classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })`
`128`	`126`	`}`
`129`	`127`
`130`	`128`	`tasks.named("compileLatestPekko10TestGroovy", GroovyCompile) {`
`131`		`- classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))`
`132`		`- dependsOn "compileLatestDepTestScala"`
	`129`	`+ classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })`
`133`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,5 @@ dependencies {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`63`		`- classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))`
`64`		`- dependsOn compileLatestDepTestScala`
	`63`	`+ classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })`
`65`	`64`	`}`