diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/CallSiteInstrumentationPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/CallSiteInstrumentationPlugin.kt index fcec4cdaf9e..40e1270dd54 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/CallSiteInstrumentationPlugin.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/CallSiteInstrumentationPlugin.kt @@ -98,7 +98,7 @@ abstract class CallSiteInstrumentationPlugin : Plugin{ extendsFrom(project.configurations.named(mainSourceSet.compileClasspathConfigurationName).get()) } - project.tasks.named(csiSourceSet.getCompileTaskName("java"), AbstractCompile::class.java).configure { + project.tasks.named(csiSourceSet.getCompileTaskName("java"), AbstractCompile::class.java) { sourceCompatibility = JavaVersion.VERSION_1_8.toString() targetCompatibility = JavaVersion.VERSION_1_8.toString() } diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle index 6075335d867..a82f51b2529 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle @@ -32,7 +32,7 @@ excludedClassesCoverage += ['com.datadog.profiling.controller.jfr.JdkTypeIDs'] // Shared JFR implementation. The earliest Java version JFR is working on is Java 8 -tasks.named("compileTestJava").configure { +tasks.named("compileTestJava") { setJavaVersion(it, 11) // tests should be compiled in Java 8 compatible way sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/benchmark/build.gradle b/dd-java-agent/benchmark/build.gradle index 8bb9e2f6def..41e30eca7c3 100644 --- a/dd-java-agent/benchmark/build.gradle +++ b/dd-java-agent/benchmark/build.gradle @@ -38,7 +38,7 @@ jmh { jmhVersion = libs.versions.jmh.get() } -tasks.named('jmh').configure { +tasks.named('jmh') { dependsOn ':dd-java-agent:shadowJar' } diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle index babf0678b41..e1376aae333 100644 --- a/dd-java-agent/build.gradle +++ b/dd-java-agent/build.gradle @@ -147,7 +147,7 @@ def includeShadowJar(TaskProvider shadowJarTask, String jarname) { } } - project.tasks.named("processResources").configure { + project.tasks.named("processResources") { dependsOn shadowJarTask } shadowJarTask.configure generalShadowJarConfig @@ -344,7 +344,7 @@ tasks.withType(Test).configureEach { dependsOn "shadowJar" } -tasks.register('checkAgentJarSize').configure { +tasks.register('checkAgentJarSize') { doLast { // Arbitrary limit to prevent unintentional increases to the agent jar size // Raise or lower as required @@ -354,6 +354,6 @@ tasks.register('checkAgentJarSize').configure { dependsOn "shadowJar" } -tasks.named('check').configure { +tasks.named('check') { dependsOn 'checkAgentJarSize' } diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle b/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle index 8e040908eae..10bbc03bc92 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle @@ -18,7 +18,7 @@ apply from: "$rootDir/gradle/test-with-scala.gradle" addTestSuite('akka23Test') addTestSuiteForDir('latestDepTest', 'test') -tasks.named("compileAkka23TestGroovy").configure { +tasks.named("compileAkka23TestGroovy") { classpath += files(sourceSets.akka23Test.scala.classesDirectory) } @@ -41,7 +41,7 @@ sourceSets { } } } -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) } @@ -68,6 +68,6 @@ configurations.matching({ it.name.startsWith('akka23') }).each({ // Run 2.3 tests along with the rest of unit tests -tasks.named("test").configure { +tasks.named("test") { dependsOn "akka23Test" } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle index a1c3c823d2f..eb2b4ba11c7 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle @@ -103,10 +103,10 @@ dependencies { latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '+' } -tasks.named("test").configure { +tasks.named("test") { dependsOn "test_before_1_11_106" } -tasks.named("forkedTest").configure { +tasks.named("forkedTest") { dependsOn "test_before_1_11_106ForkedTest" } diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 0be3452d7bb..38e238d9bab 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -128,7 +128,7 @@ if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleRep } -tasks.named('shadowJar').configure { +tasks.named('shadowJar') { duplicatesStrategy = DuplicatesStrategy.FAIL dependencies { // the tracer is now in a separate shadow jar diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle b/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle index 631cfef35ee..c053f0b80b5 100644 --- a/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle +++ b/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle @@ -31,7 +31,7 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-transport', version: '+' } -tasks.named("latestDepTest").configure { +tasks.named("latestDepTest") { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/finatra-2.9/build.gradle b/dd-java-agent/instrumentation/finatra-2.9/build.gradle index a863777080c..971fcf8e604 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/build.gradle +++ b/dd-java-agent/instrumentation/finatra-2.9/build.gradle @@ -35,16 +35,16 @@ dependencies { latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+' } -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory)) dependsOn "compileLatestDepTestScala" } -tasks.named("compileLatestPre207TestGroovy").configure { +tasks.named("compileLatestPre207TestGroovy") { classpath = classpath.plus(files(compileLatestPre207TestScala.destinationDirectory)) dependsOn "compileLatestPre207TestScala" } -tasks.named("latestDepTest").configure { +tasks.named("latestDepTest") { finalizedBy latestPre207Test } diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle index 555b8ba60d5..692894c79d0 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle @@ -12,13 +12,13 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepJava11Test', 'latestDepTest', 'test') -tasks.named("compileLatestDepJava11TestJava").configure { +tasks.named("compileLatestDepJava11TestJava") { setJavaVersion(it, 11) } -tasks.named("compileLatestDepJava11TestGroovy").configure { +tasks.named("compileLatestDepJava11TestGroovy") { javaLauncher = getJavaLauncherFor(11) } -tasks.named("latestDepJava11Test").configure { +tasks.named("latestDepJava11Test") { javaLauncher = getJavaLauncherFor(11) } diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle index 6c1b1ff4afc..ab1366820e2 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle +++ b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle @@ -42,7 +42,7 @@ previewTest.configure { jvmArgs = ['--enable-preview'] } // Require the preview test suite to run as part of module check -tasks.named("check").configure { +tasks.named("check") { dependsOn "previewTest" } diff --git a/dd-java-agent/instrumentation/java-http-client/build.gradle b/dd-java-agent/instrumentation/java-http-client/build.gradle index 096bb210e3c..881c76e68c8 100644 --- a/dd-java-agent/instrumentation/java-http-client/build.gradle +++ b/dd-java-agent/instrumentation/java-http-client/build.gradle @@ -12,7 +12,7 @@ apply from: "$rootDir/gradle/java.gradle" apply plugin: "idea" -tasks.named("compileMain_java11Java").configure { +tasks.named("compileMain_java11Java") { it.sourceCompatibility = JavaVersion.VERSION_11 it.targetCompatibility = JavaVersion.VERSION_11 setJavaVersion(it, 11) diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle b/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle index 50c9a86c164..012d4e239bd 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle @@ -54,7 +54,7 @@ dependencies { latestDepTestImplementation group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '+' } -tasks.named("test").configure { +tasks.named("test") { dependsOn "resteasy31Test" dependsOn "nestedTest" } diff --git a/dd-java-agent/instrumentation/jdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/build.gradle index dd9225c9ae1..c39dee6fc03 100644 --- a/dd-java-agent/instrumentation/jdbc/build.gradle +++ b/dd-java-agent/instrumentation/jdbc/build.gradle @@ -77,12 +77,12 @@ dependencies { latestDepJava11TestImplementation group: 'com.zaxxer', name: 'HikariCP', version: '+' } -tasks.named("check").configure { +tasks.named("check") { dependsOn "oldH2Test" dependsOn "oldPostgresTest" } -tasks.named("latestDepJava11Test").configure { +tasks.named("latestDepJava11Test") { javaLauncher = getJavaLauncherFor(11) } diff --git a/dd-java-agent/instrumentation/jdbc/scalikejdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/scalikejdbc/build.gradle index 39a8cc8a5c5..01258ed92f2 100644 --- a/dd-java-agent/instrumentation/jdbc/scalikejdbc/build.gradle +++ b/dd-java-agent/instrumentation/jdbc/scalikejdbc/build.gradle @@ -10,12 +10,12 @@ apply plugin: 'scala' addTestSuiteForDir('latestDepTest', 'test') -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn "compileTestScala" classpath += files(compileTestScala.destinationDirectory) } -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { dependsOn "compileLatestDepTestScala" classpath += files(compileLatestDepTestScala.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle index 34722f534a2..58505b89386 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle @@ -105,7 +105,7 @@ instrument { ] } -tasks['compileMain_jetty10Java'].configure { +tasks.named("compileMain_jetty10Java") { setJavaVersion(it, 11) } @@ -114,10 +114,10 @@ addTestSuiteForDir('jetty94ForkedTest', 'test') addTestSuiteForDir('latestDepJetty9ForkedTest', 'test') addTestSuiteForDir('latestDepForkedTest', 'test') -tasks.named("latestDepForkedTest").configure { +tasks.named("latestDepForkedTest") { javaLauncher = getJavaLauncherFor(11) } -tasks.named("compileLatestDepForkedTestGroovy").configure { +tasks.named("compileLatestDepForkedTestGroovy") { setJavaVersion(it, 11) } diff --git a/dd-java-agent/instrumentation/junit-4.10/build.gradle b/dd-java-agent/instrumentation/junit-4.10/build.gradle index 8a6c4ffc0e1..8e9fc779083 100644 --- a/dd-java-agent/instrumentation/junit-4.10/build.gradle +++ b/dd-java-agent/instrumentation/junit-4.10/build.gradle @@ -12,7 +12,7 @@ muzzle { addTestSuiteForDir('latestDepTest', 'test') -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { classpath += files(compileLatestDepTestKotlin.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/junit-5.3/build.gradle b/dd-java-agent/instrumentation/junit-5.3/build.gradle index bd69cc5424a..d4315f94839 100644 --- a/dd-java-agent/instrumentation/junit-5.3/build.gradle +++ b/dd-java-agent/instrumentation/junit-5.3/build.gradle @@ -58,7 +58,7 @@ configurations.matching({ it.name.startsWith('test') }).each({ } }) -tasks.named("compileLatestDepTestJava").configure { +tasks.named("compileLatestDepTestJava") { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle index e1990a38589..65aa7bf93f0 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle @@ -57,7 +57,7 @@ configurations.matching({ it.name.startsWith('test') }).each({ } }) -tasks.named("compileLatestDepTestJava").configure { +tasks.named("compileLatestDepTestJava") { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/karate/build.gradle b/dd-java-agent/instrumentation/karate/build.gradle index 3db28f83d34..085aa516f7e 100644 --- a/dd-java-agent/instrumentation/karate/build.gradle +++ b/dd-java-agent/instrumentation/karate/build.gradle @@ -81,7 +81,7 @@ sourceSets { } } -tasks.named("compileLatestDepTestJava").configure { +tasks.named("compileLatestDepTestJava") { setJavaVersion(it, 11) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle index 9f723812ebc..f68ac87ad53 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle +++ b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle @@ -26,15 +26,15 @@ apply from: "$rootDir/gradle/test-with-kotlin.gradle" addTestSuite('latestDepTest') -tasks.named("compileTestFixturesGroovy").configure { +tasks.named("compileTestFixturesGroovy") { classpath += files(compileTestFixturesKotlin.destinationDirectory) } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { classpath += files(compileTestKotlin.destinationDirectory) } -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { classpath += files(compileLatestDepTestKotlin.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle index f1a6cb184a9..6e0dde18d13 100644 --- a/dd-java-agent/instrumentation/mule-4.5/build.gradle +++ b/dd-java-agent/instrumentation/mule-4.5/build.gradle @@ -114,20 +114,20 @@ forbiddenApisMain_java11 { failOnMissingClasses = false } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'mvnPackage', 'extractMuleServices' } -tasks.named("compileMule46ForkedTestGroovy").configure { +tasks.named("compileMule46ForkedTestGroovy") { dependsOn 'mvnPackage', 'extractMule46Services' } -tasks.named("compileLatestDepForkedTestGroovy").configure { +tasks.named("compileLatestDepForkedTestGroovy") { dependsOn 'mvnPackage', 'extractLatestMuleServices' setJavaVersion(it, 17) } -tasks.named("compileLatestDepForkedTestJava").configure { +tasks.named("compileLatestDepForkedTestJava") { setJavaVersion(it, 17) } diff --git a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle index 67f7353e5c7..890373d9e39 100644 --- a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle @@ -21,6 +21,6 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-buffer', version: '+' } -tasks.named("latestDepTest").configure { +tasks.named("latestDepTest") { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle index c54eb3a7072..a6119373137 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle @@ -21,7 +21,7 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-common', version: '+' } -tasks.named("latestDepTest").configure { +tasks.named("latestDepTest") { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle index 056e691a1ff..35a01fa44bc 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle @@ -21,6 +21,6 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-common', version: '+' } -tasks.named("latestDepTest").configure { +tasks.named("latestDepTest") { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/pekko-concurrent/build.gradle b/dd-java-agent/instrumentation/pekko-concurrent/build.gradle index 18c17bd7322..0fa5c2e2ae7 100644 --- a/dd-java-agent/instrumentation/pekko-concurrent/build.gradle +++ b/dd-java-agent/instrumentation/pekko-concurrent/build.gradle @@ -23,7 +23,7 @@ apply from: "$rootDir/gradle/test-with-scala.gradle" addTestSuiteForDir('latestDepTest', 'test') -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) } diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/build.gradle b/dd-java-agent/instrumentation/pekko-http-1.0/build.gradle index e5e0540b8ae..7d84437efc6 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/build.gradle +++ b/dd-java-agent/instrumentation/pekko-http-1.0/build.gradle @@ -108,12 +108,12 @@ latestDepIastTest { } } -tasks.named("test").configure { +tasks.named("test") { dependsOn "baseTest" dependsOn "iastTest" } -tasks.named('latestDepTest').configure { +tasks.named('latestDepTest') { dependsOn "latestDepIastTest" } diff --git a/dd-java-agent/instrumentation/play/play-2.6/build.gradle b/dd-java-agent/instrumentation/play/play-2.6/build.gradle index 34019a078c5..a38297784bd 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.6/build.gradle @@ -126,7 +126,7 @@ configurations.matching({ it.name.startsWith('latestDepTest') }).each({ force group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.5' } }) -tasks.named("compileLatestDepTestJava").configure { +tasks.named("compileLatestDepTestJava") { it.sourceCompatibility = JavaVersion.VERSION_11 it.targetCompatibility = JavaVersion.VERSION_11 setJavaVersion(it, 11) diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle index 311bec0f5d4..3228d059063 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle @@ -40,6 +40,6 @@ tasks.withType(Test).configureEach { usesService(testcontainersLimit) } -tasks.named("latestDepTest").configure { +tasks.named("latestDepTest") { finalizedBy latestReactorTest } diff --git a/dd-java-agent/instrumentation/restlet-2.2/build.gradle b/dd-java-agent/instrumentation/restlet-2.2/build.gradle index 94905609227..67a30626a17 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/build.gradle +++ b/dd-java-agent/instrumentation/restlet-2.2/build.gradle @@ -23,7 +23,7 @@ repositories { addTestSuiteForDir('baseForkedTest', 'baseTest') addTestSuite('latestDepTest') -tasks.named("test").configure { +tasks.named("test") { dependsOn "baseForkedTest" } diff --git a/dd-java-agent/instrumentation/rmi/build.gradle b/dd-java-agent/instrumentation/rmi/build.gradle index 55ef269020b..7e1280fda59 100644 --- a/dd-java-agent/instrumentation/rmi/build.gradle +++ b/dd-java-agent/instrumentation/rmi/build.gradle @@ -30,6 +30,6 @@ def rmic = tasks.register('rmic', Exec) { ) } -tasks.named("test").configure { +tasks.named("test") { dependsOn rmic } diff --git a/dd-java-agent/instrumentation/scala-concurrent/build.gradle b/dd-java-agent/instrumentation/scala-concurrent/build.gradle index 5dfaadc6ee4..a5ebd5968c0 100644 --- a/dd-java-agent/instrumentation/scala-concurrent/build.gradle +++ b/dd-java-agent/instrumentation/scala-concurrent/build.gradle @@ -19,16 +19,16 @@ addTestSuite('latestDepTest') addTestSuiteForDir('latest12Test', 'latestDepTest') addTestSuiteForDir('latest11Test', 'test') -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { classpath += files(sourceSets.test.scala.classesDirectory) } -tasks.named("compileLatest12TestGroovy").configure { +tasks.named("compileLatest12TestGroovy") { classpath += files(sourceSets.latest12Test.scala.classesDirectory) } -tasks.named("compileLatest11TestGroovy").configure { +tasks.named("compileLatest11TestGroovy") { classpath += files(sourceSets.latest11Test.scala.classesDirectory) } -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) } @@ -45,7 +45,7 @@ dependencies { latestDepTestImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13') } -tasks.named("latestDepTest").configure { +tasks.named("latestDepTest") { dependsOn "latest11Test" dependsOn "latest12Test" } diff --git a/dd-java-agent/instrumentation/scala-promise/build.gradle b/dd-java-agent/instrumentation/scala-promise/build.gradle index 284d6247c3e..25fa5520996 100644 --- a/dd-java-agent/instrumentation/scala-promise/build.gradle +++ b/dd-java-agent/instrumentation/scala-promise/build.gradle @@ -13,7 +13,7 @@ muzzle { apply from: "$rootDir/gradle/java.gradle" apply plugin: 'scala' -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { classpath += files(sourceSets.test.scala.classesDirectory) } diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle index 4312452e285..baa9b68315a 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle @@ -45,17 +45,17 @@ sourceSets { latestDepForkedTest.scala.srcDir project(':dd-java-agent:instrumentation:scala-promise').sourceSets.test.scala } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { classpath += files(sourceSets.test.scala.classesDirectory) dependsOn "compileTestScala" } -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) dependsOn "compileLatestDepTestScala" } -tasks.named("compileLatestDepForkedTestGroovy").configure { +tasks.named("compileLatestDepForkedTestGroovy") { classpath += files(sourceSets.latestDepForkedTest.scala.classesDirectory) dependsOn "compileLatestDepForkedTestScala" } diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle index 4331e993105..59b062db1f8 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle @@ -45,15 +45,15 @@ sourceSets { latestDepForkedTest.scala.srcDir project(':dd-java-agent:instrumentation:scala-promise').sourceSets.test.scala } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { classpath += files(sourceSets.test.scala.classesDirectory) } -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) } -tasks.named("compileLatestDepForkedTestGroovy").configure { +tasks.named("compileLatestDepForkedTestGroovy") { classpath += files(sourceSets.latestDepForkedTest.scala.classesDirectory) } diff --git a/dd-java-agent/instrumentation/scala/build.gradle b/dd-java-agent/instrumentation/scala/build.gradle index 9247a8d070d..299f09eef6b 100644 --- a/dd-java-agent/instrumentation/scala/build.gradle +++ b/dd-java-agent/instrumentation/scala/build.gradle @@ -66,7 +66,7 @@ final testTasks = scalaVersions.collect { scalaLibrary -> } } -tasks.named('test', Test).configure { +tasks.named('test', Test) { systemProperty('uses.java.concat', false) // version 2.10.7 does not use java concatenation finalizedBy(testTasks) } diff --git a/dd-java-agent/instrumentation/selenium/build.gradle b/dd-java-agent/instrumentation/selenium/build.gradle index 80f45dcf91e..1e600435062 100644 --- a/dd-java-agent/instrumentation/selenium/build.gradle +++ b/dd-java-agent/instrumentation/selenium/build.gradle @@ -42,7 +42,7 @@ configurations.matching({ it.name.startsWith('test') || it.name.startsWith('late } }) -tasks.named("compileLatestDepTestJava").configure { +tasks.named("compileLatestDepTestJava") { setJavaVersion(it, 11) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/slick/build.gradle b/dd-java-agent/instrumentation/slick/build.gradle index 7fbc4135fb8..37171291dea 100644 --- a/dd-java-agent/instrumentation/slick/build.gradle +++ b/dd-java-agent/instrumentation/slick/build.gradle @@ -10,12 +10,12 @@ apply plugin: 'scala' addTestSuiteForDir('latestDepTest', 'test') -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn "compileTestScala" classpath += files(compileTestScala.destinationDirectory) } -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { dependsOn "compileLatestDepTestScala" classpath += files(compileLatestDepTestScala.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle index a9a87a99ef1..14b4ff3f07c 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle @@ -58,7 +58,7 @@ dependencies { latestDepTestImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: '+' } -tasks.named("test").configure { +tasks.named("test") { dependsOn "test_spark24" dependsOn "test_spark32" } diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle index a5de69adf09..a779138bb3c 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle @@ -57,6 +57,6 @@ dependencies { latestDepTestImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: '3.+' } -tasks.named("test").configure { +tasks.named("test") { dependsOn "test_spark32" } diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle index b065d7fa620..17c5a2291ae 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle @@ -130,7 +130,7 @@ dependencies { latestIastTestImplementation project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.12') } -tasks.named("latestDepTest").configure { +tasks.named("latestDepTest") { dependsOn "latestBoot20Test" dependsOn "latestBoot24Test" dependsOn "latestBoot2LatestTest" diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle index 4e9ed4cdb28..e37c0cc74c3 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle +++ b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle @@ -67,7 +67,6 @@ dependencies { latestDepTestRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5') } - def extractWildfly(config, zipFileNamePrefix, sync) { delete(fileTree(buildDir).include("wildfly-*/standalone/deployments/**")) @@ -85,7 +84,6 @@ def extractWildfly(config, zipFileNamePrefix, sync) { } } - tasks.register("extractWildfly", Copy) { dependsOn configurations.wildflyTest mustRunAfter tasks.compileTestGroovy @@ -107,21 +105,22 @@ tasks.register("extractLatestWildfly", Copy) { onlyIf { !project.rootProject.hasProperty("skipTests") } } - -tasks.named("test").configure { +tasks.named("test") { dependsOn 'extractWildfly' } -tasks.named("forkedTest").configure { +tasks.named("forkedTest") { dependsOn 'extractWildfly' } -tasks.named("latestDepForkedTest").configure { + +tasks.named("latestDepForkedTest") { dependsOn 'extractLatestWildfly' } -tasks.named("latestDepTest").configure { +tasks.named("latestDepTest") { dependsOn 'extractLatestWildfly' } + compileTestGroovy.configure { javaLauncher = getJavaLauncherFor(11) } @@ -131,6 +130,7 @@ compileTestGroovy.configure { javaLauncher = getJavaLauncherFor(17) } } + compileTestJava.configure { it.configure { setJavaVersion(it, 11) @@ -154,6 +154,7 @@ processTestResources { ) } } + [processLatestDepTestResources, processLatestDepForkedTestResources].each { it.filesMatching('**/WEB-INF/web.xml') { expand( diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle b/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle index b5f15fc8782..c4e1b6f3f5e 100644 --- a/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle +++ b/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle @@ -29,7 +29,7 @@ apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle" addTestSuiteForDir('latestDepTest', 'test') -tasks.named("compileLatestDepTestGroovy").configure { +tasks.named("compileLatestDepTestGroovy") { dependsOn "compileLatestDepTestScala" classpath += files(compileLatestDepTestScala.destinationDirectory) } diff --git a/dd-smoke-tests/armeria-grpc/build.gradle b/dd-smoke-tests/armeria-grpc/build.gradle index 34269915845..3e49a23b935 100644 --- a/dd-smoke-tests/armeria-grpc/build.gradle +++ b/dd-smoke-tests/armeria-grpc/build.gradle @@ -79,7 +79,7 @@ armeriaBuild { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'armeriaBuild' outputs.upToDateWhen { !armeriaBuild.didWork diff --git a/dd-smoke-tests/concurrent/java-21/build.gradle b/dd-smoke-tests/concurrent/java-21/build.gradle index 9bfdf330189..01eb4506ad7 100644 --- a/dd-smoke-tests/concurrent/java-21/build.gradle +++ b/dd-smoke-tests/concurrent/java-21/build.gradle @@ -31,7 +31,7 @@ forbiddenApisMain { failOnMissingClasses = false } ['spotlessApply', 'spotlessCheck', 'spotlessJava', 'spotbugsMain'].each { - tasks.named(it).configure { enabled = false } + tasks.named(it) { enabled = false } } application { diff --git a/dd-smoke-tests/concurrent/java-25/build.gradle b/dd-smoke-tests/concurrent/java-25/build.gradle index 46dd9472c94..d39a482e6a6 100644 --- a/dd-smoke-tests/concurrent/java-25/build.gradle +++ b/dd-smoke-tests/concurrent/java-25/build.gradle @@ -18,7 +18,7 @@ apply from: "$rootDir/gradle/java.gradle" description = 'JDK 25 Concurrent Integration Tests' -tasks.named('compileJava').configure { +tasks.named('compileJava') { setJavaVersion(it, 25) sourceCompatibility = JavaVersion.VERSION_25 targetCompatibility = JavaVersion.VERSION_25 @@ -32,7 +32,7 @@ tasks.named('compileJava').configure { } } -tasks.named('compileTestGroovy').configure { +tasks.named('compileTestGroovy') { setJavaVersion(it, 8) sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -46,7 +46,7 @@ forbiddenApisMain { failOnMissingClasses = false } ['spotlessApply', 'spotlessCheck', 'spotlessJava', 'spotbugsMain'].each { - tasks.named(it).configure { enabled = false } + tasks.named(it) { enabled = false } } application { diff --git a/dd-smoke-tests/iast-util/iast-util-11/build.gradle b/dd-smoke-tests/iast-util/iast-util-11/build.gradle index 1f16631579b..997d048cf59 100644 --- a/dd-smoke-tests/iast-util/iast-util-11/build.gradle +++ b/dd-smoke-tests/iast-util/iast-util-11/build.gradle @@ -21,7 +21,7 @@ dependencies { testFixturesImplementation testFixtures(project(":dd-smoke-tests:iast-util")) } -tasks.named("compileJava", JavaCompile).configure { +tasks.named("compileJava", JavaCompile) { setJavaVersion(it, 11) sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 diff --git a/dd-smoke-tests/iast-util/iast-util-17/build.gradle b/dd-smoke-tests/iast-util/iast-util-17/build.gradle index cc931fd2797..6011501f26b 100644 --- a/dd-smoke-tests/iast-util/iast-util-17/build.gradle +++ b/dd-smoke-tests/iast-util/iast-util-17/build.gradle @@ -21,7 +21,7 @@ dependencies { testFixturesImplementation testFixtures(project(":dd-smoke-tests:iast-util")) } -tasks.named("compileJava", JavaCompile).configure { +tasks.named("compileJava", JavaCompile) { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/dd-smoke-tests/kafka-3/build.gradle b/dd-smoke-tests/kafka-3/build.gradle index 7fa33782393..0d593aa2006 100644 --- a/dd-smoke-tests/kafka-3/build.gradle +++ b/dd-smoke-tests/kafka-3/build.gradle @@ -41,7 +41,7 @@ tasks.register('bootJar', Exec) { group('build') } -tasks.named('compileTestGroovy').configure { +tasks.named('compileTestGroovy') { dependsOn 'bootJar' outputs.upToDateWhen { !bootJar.didWork diff --git a/dd-smoke-tests/log-injection/build.gradle b/dd-smoke-tests/log-injection/build.gradle index e8778574f5f..afc19fb8a14 100644 --- a/dd-smoke-tests/log-injection/build.gradle +++ b/dd-smoke-tests/log-injection/build.gradle @@ -56,7 +56,7 @@ sourceSets { } -tasks.named('processLoggingResources').configure { +tasks.named('processLoggingResources') { // Don't know why this tries to copy the logback.xml file twice, but only accept it once duplicatesStrategy = DuplicatesStrategy.EXCLUDE } @@ -128,7 +128,7 @@ dependencies { def generateTestingJar(String interfaceName, String backend, List configurationsList) { def name = interfaceName + "Interface" + backend + "Backend" - tasks.register(name, ShadowJar).configure { + tasks.register(name, ShadowJar) { from sourceSets.main.output from sourceSets.logging.output diff --git a/dd-smoke-tests/play-2.4/build.gradle b/dd-smoke-tests/play-2.4/build.gradle index 5a72a7d5694..74817b3824e 100644 --- a/dd-smoke-tests/play-2.4/build.gradle +++ b/dd-smoke-tests/play-2.4/build.gradle @@ -72,7 +72,7 @@ configurations.testImplementation { exclude group:'com.typesafe.play', module:"play-test_$scalaVer" } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'stageMainDist' outputs.upToDateWhen { !stageMainDist.didWork diff --git a/dd-smoke-tests/play-2.5/build.gradle b/dd-smoke-tests/play-2.5/build.gradle index ec06319d23c..0ac6814028d 100644 --- a/dd-smoke-tests/play-2.5/build.gradle +++ b/dd-smoke-tests/play-2.5/build.gradle @@ -74,7 +74,7 @@ configurations.testImplementation { exclude group:'com.typesafe.play', module:"play-test_$scalaVer" } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'stageMainDist' outputs.upToDateWhen { !stageMainDist.didWork diff --git a/dd-smoke-tests/play-2.6/build.gradle b/dd-smoke-tests/play-2.6/build.gradle index 0366379aade..f677ab717e5 100644 --- a/dd-smoke-tests/play-2.6/build.gradle +++ b/dd-smoke-tests/play-2.6/build.gradle @@ -74,7 +74,7 @@ configurations.testImplementation { exclude group:'com.typesafe.play', module:"play-test_$scalaVer" } -tasks.named('compileTestGroovy').configure { +tasks.named('compileTestGroovy') { dependsOn 'stageMainDist' outputs.upToDateWhen { !stageMainDist.didWork diff --git a/dd-smoke-tests/play-2.7/build.gradle b/dd-smoke-tests/play-2.7/build.gradle index e563538fd09..8a83461f56d 100644 --- a/dd-smoke-tests/play-2.7/build.gradle +++ b/dd-smoke-tests/play-2.7/build.gradle @@ -74,7 +74,7 @@ configurations.testImplementation { exclude group:'com.typesafe.play', module:"play-test_$scalaVer" } -tasks.named('compileTestGroovy').configure { +tasks.named('compileTestGroovy') { dependsOn 'stageMainDist' outputs.upToDateWhen { !stageMainDist.didWork diff --git a/dd-smoke-tests/play-2.8-otel/build.gradle b/dd-smoke-tests/play-2.8-otel/build.gradle index 1dba9aae90a..b5c0925b3d2 100644 --- a/dd-smoke-tests/play-2.8-otel/build.gradle +++ b/dd-smoke-tests/play-2.8-otel/build.gradle @@ -70,7 +70,7 @@ configurations.testImplementation { exclude group:'com.typesafe.play', module:"play-test_$scalaVer" } -tasks.named('compileTestGroovy').configure { +tasks.named('compileTestGroovy') { dependsOn 'stageMainDist' outputs.upToDateWhen { !stageMainDist.didWork diff --git a/dd-smoke-tests/play-2.8-split-routes/build.gradle b/dd-smoke-tests/play-2.8-split-routes/build.gradle index 73b4eea520e..c7693b7fea3 100644 --- a/dd-smoke-tests/play-2.8-split-routes/build.gradle +++ b/dd-smoke-tests/play-2.8-split-routes/build.gradle @@ -70,7 +70,7 @@ configurations.testImplementation { exclude group: 'com.typesafe.play', module: "play-test_$scalaVer" } -tasks.named('compileTestGroovy').configure { +tasks.named('compileTestGroovy') { dependsOn 'stageMainDist' outputs.upToDateWhen { !stageMainDist.didWork diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle index 2d031b727f4..88cfbae8f53 100644 --- a/dd-smoke-tests/play-2.8/build.gradle +++ b/dd-smoke-tests/play-2.8/build.gradle @@ -73,7 +73,7 @@ configurations.testImplementation { exclude group: 'com.typesafe.play', module: "play-test_$scalaVer" } -tasks.named('compileTestGroovy').configure { +tasks.named('compileTestGroovy') { dependsOn 'stageMainDist' outputs.upToDateWhen { !stageMainDist.didWork diff --git a/dd-smoke-tests/quarkus-native/build.gradle b/dd-smoke-tests/quarkus-native/build.gradle index 8c36724cfef..922a8f30d40 100644 --- a/dd-smoke-tests/quarkus-native/build.gradle +++ b/dd-smoke-tests/quarkus-native/build.gradle @@ -60,7 +60,7 @@ if (version >= 17) { dependsOn project(':dd-java-agent').tasks.named('shadowJar') // Use dev agent } - tasks.named('compileTestGroovy').configure { + tasks.named('compileTestGroovy') { dependsOn 'quarkusNativeBuild' outputs.upToDateWhen { !quarkusNativeBuild.didWork diff --git a/dd-smoke-tests/quarkus/build.gradle b/dd-smoke-tests/quarkus/build.gradle index 777b5fdc342..fb966261009 100644 --- a/dd-smoke-tests/quarkus/build.gradle +++ b/dd-smoke-tests/quarkus/build.gradle @@ -38,7 +38,7 @@ quarkusBuild { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'quarkusBuild' outputs.upToDateWhen { !quarkusBuild.didWork diff --git a/dd-smoke-tests/rum/wildfly-15/build.gradle b/dd-smoke-tests/rum/wildfly-15/build.gradle index 039afefb819..903e263021f 100644 --- a/dd-smoke-tests/rum/wildfly-15/build.gradle +++ b/dd-smoke-tests/rum/wildfly-15/build.gradle @@ -67,7 +67,7 @@ earBuild { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn tasks.earBuild outputs.upToDateWhen { !earBuild.didWork diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle index 97d01b18b90..22fe8873879 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle @@ -35,7 +35,7 @@ webfluxBuild { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'webfluxBuild' outputs.upToDateWhen { !webfluxBuild.didWork diff --git a/dd-smoke-tests/spring-boot-3.0-native/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/build.gradle index 2057567574b..921ffd5cb0e 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/build.gradle @@ -64,7 +64,7 @@ if (version >= 17) { dependsOn project(':dd-java-agent').tasks.named('shadowJar') // Use dev agent } - tasks.named('compileTestGroovy').configure { + tasks.named('compileTestGroovy') { dependsOn 'springNativeBuild' outputs.upToDateWhen { !springNativeBuild.didWork diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle index ea753afd912..d3754b09ded 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle @@ -39,7 +39,7 @@ webfluxBuild30 { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'webfluxBuild30' outputs.upToDateWhen { !webfluxBuild30.didWork diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle index 34c71aac72b..3749cf99617 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle @@ -39,7 +39,7 @@ compileTestGroovy { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'webmvcBuild30' outputs.upToDateWhen { !webmvcBuild30.didWork diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle index 92514f784b5..5e503bc1e30 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle @@ -39,7 +39,7 @@ compileTestGroovy { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'webmvcBuild3' outputs.upToDateWhen { !webmvcBuild3.didWork diff --git a/dd-smoke-tests/springboot-java-11/build.gradle b/dd-smoke-tests/springboot-java-11/build.gradle index a9594cd7c2e..e3392d30329 100644 --- a/dd-smoke-tests/springboot-java-11/build.gradle +++ b/dd-smoke-tests/springboot-java-11/build.gradle @@ -23,7 +23,7 @@ dependencies { implementation project(':dd-smoke-tests:iast-util:iast-util-11') } -tasks.named("compileJava", JavaCompile).configure { +tasks.named("compileJava", JavaCompile) { setJavaVersion(it, 11) sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 diff --git a/dd-smoke-tests/springboot-java-17/build.gradle b/dd-smoke-tests/springboot-java-17/build.gradle index 3ab20c20da4..93003529d30 100644 --- a/dd-smoke-tests/springboot-java-17/build.gradle +++ b/dd-smoke-tests/springboot-java-17/build.gradle @@ -23,7 +23,7 @@ dependencies { implementation project(':dd-smoke-tests:iast-util:iast-util-17') } -tasks.named("compileJava", JavaCompile).configure { +tasks.named("compileJava", JavaCompile) { setJavaVersion(it, 17) sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/dd-smoke-tests/springboot-openliberty-20/build.gradle b/dd-smoke-tests/springboot-openliberty-20/build.gradle index 6716a0ffe46..01b95f1dc50 100644 --- a/dd-smoke-tests/springboot-openliberty-20/build.gradle +++ b/dd-smoke-tests/springboot-openliberty-20/build.gradle @@ -21,7 +21,7 @@ tasks.register('mvnStage', Exec) { outputs.file jarPath } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'mvnStage' outputs.upToDateWhen { !mvnStage.didWork diff --git a/dd-smoke-tests/springboot-openliberty-23/build.gradle b/dd-smoke-tests/springboot-openliberty-23/build.gradle index e0cbfe891ba..68c7a7e6747 100644 --- a/dd-smoke-tests/springboot-openliberty-23/build.gradle +++ b/dd-smoke-tests/springboot-openliberty-23/build.gradle @@ -21,7 +21,7 @@ tasks.register('mvnStage', Exec) { outputs.file jarPath } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'mvnStage' outputs.upToDateWhen { !mvnStage.didWork diff --git a/dd-smoke-tests/vertx-3.4/build.gradle b/dd-smoke-tests/vertx-3.4/build.gradle index 2d23603b9f1..5f3d381b4f2 100644 --- a/dd-smoke-tests/vertx-3.4/build.gradle +++ b/dd-smoke-tests/vertx-3.4/build.gradle @@ -38,7 +38,7 @@ vertxBuild { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'vertxBuild' outputs.upToDateWhen { !vertxBuild.didWork diff --git a/dd-smoke-tests/vertx-3.9-resteasy/build.gradle b/dd-smoke-tests/vertx-3.9-resteasy/build.gradle index 718d07745e8..68b619f369d 100644 --- a/dd-smoke-tests/vertx-3.9-resteasy/build.gradle +++ b/dd-smoke-tests/vertx-3.9-resteasy/build.gradle @@ -35,7 +35,7 @@ vertxBuild { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'vertxBuild' outputs.upToDateWhen { !vertxBuild.didWork diff --git a/dd-smoke-tests/vertx-3.9/build.gradle b/dd-smoke-tests/vertx-3.9/build.gradle index 70161bba855..d442b7ec98d 100644 --- a/dd-smoke-tests/vertx-3.9/build.gradle +++ b/dd-smoke-tests/vertx-3.9/build.gradle @@ -36,7 +36,7 @@ vertxBuild { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'vertxBuild' outputs.upToDateWhen { !vertxBuild.didWork diff --git a/dd-smoke-tests/vertx-4.2/build.gradle b/dd-smoke-tests/vertx-4.2/build.gradle index 0d1ca0cd001..960764e53f0 100644 --- a/dd-smoke-tests/vertx-4.2/build.gradle +++ b/dd-smoke-tests/vertx-4.2/build.gradle @@ -37,7 +37,7 @@ vertxBuild { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn 'vertxBuild' outputs.upToDateWhen { !vertxBuild.didWork diff --git a/dd-smoke-tests/wildfly/build.gradle b/dd-smoke-tests/wildfly/build.gradle index 24a6ac242a4..4e0ec9d2ae4 100644 --- a/dd-smoke-tests/wildfly/build.gradle +++ b/dd-smoke-tests/wildfly/build.gradle @@ -67,7 +67,7 @@ earBuild { dependsOn project(':dd-trace-api').tasks.named("jar") } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { dependsOn tasks.earBuild outputs.upToDateWhen { !earBuild.didWork diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle index b2c3d53ab4b..bc0299f3feb 100644 --- a/gradle/jacoco.gradle +++ b/gradle/jacoco.gradle @@ -19,7 +19,7 @@ tasks.register('forkedTestJacocoData') { } } -tasks.named('jacocoTestReport').configure { +tasks.named('jacocoTestReport') { dependsOn('test', 'forkedTestJacocoData') reports { xml.required = true @@ -77,10 +77,10 @@ afterEvaluate { onlyIf { !project.rootProject.hasProperty('skipTests') } } - tasks.named('jacocoTestCoverageVerification').configure { + tasks.named('jacocoTestCoverageVerification') { dependsOn('jacocoTestReport') } - tasks.named('check').configure { + tasks.named('check') { dependsOn('jacocoTestCoverageVerification') } } diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle index b00fbc1d37c..c7c32810ff7 100644 --- a/gradle/java_no_deps.gradle +++ b/gradle/java_no_deps.gradle @@ -21,7 +21,7 @@ ext.testcontainersLimit = gradle.sharedServices.registerIfAbsent("testcontainers // Task for tests that want to run forked in their own separate JVM if (tasks.matching({ it.name == 'forkedTest' }).empty) { - tasks.register('forkedTest', Test).configure { + tasks.register('forkedTest', Test) { useJUnitPlatform() } } @@ -252,7 +252,7 @@ project.afterEvaluate { if (project.plugins.hasPlugin('kotlin')) { ['compileKotlin', 'compileTestKotlin'].each { type -> - tasks.named(type).configure { + tasks.named(type) { kotlinDaemonJvmArguments = ["-Xmx256m", "-XX:+UseParallelGC"] } } diff --git a/gradle/test-with-kotlin.gradle b/gradle/test-with-kotlin.gradle index f4de18e697c..b124878c1aa 100644 --- a/gradle/test-with-kotlin.gradle +++ b/gradle/test-with-kotlin.gradle @@ -2,7 +2,7 @@ apply plugin: 'kotlin' apply from: "$rootDir/gradle/spotless/spotless-kotlin.gradle" -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { //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) diff --git a/gradle/test-with-scala.gradle b/gradle/test-with-scala.gradle index 2a8475c5d45..d25891cc7d8 100644 --- a/gradle/test-with-scala.gradle +++ b/gradle/test-with-scala.gradle @@ -7,6 +7,6 @@ dependencies { testImplementation libs.scala } -tasks.named("compileTestGroovy").configure { +tasks.named("compileTestGroovy") { classpath += files(sourceSets.test.scala.classesDirectory) } diff --git a/test-published-dependencies/ot-is-shaded/build.gradle b/test-published-dependencies/ot-is-shaded/build.gradle index 1342c8e24d0..7dc441997a2 100644 --- a/test-published-dependencies/ot-is-shaded/build.gradle +++ b/test-published-dependencies/ot-is-shaded/build.gradle @@ -115,7 +115,7 @@ tasks.register('checkJarSize') { } } -tasks.named('check').configure { +tasks.named('check') { dependsOn 'checkJarContents' dependsOn 'checkJarSize' } diff --git a/utils/socket-utils/build.gradle.kts b/utils/socket-utils/build.gradle.kts index d26dffe6e32..2fc7d820460 100644 --- a/utils/socket-utils/build.gradle.kts +++ b/utils/socket-utils/build.gradle.kts @@ -27,7 +27,7 @@ fun AbstractCompile.setJavaVersion(javaVersionInteger: Int) { } listOf("compileMain_java17Java", "compileTestJava").forEach { - tasks.named(it).configure { + tasks.named(it) { setJavaVersion(17) sourceCompatibility = JavaVersion.VERSION_1_8.toString() targetCompatibility = JavaVersion.VERSION_1_8.toString()