chore: Removes unnecessary .configure calls

bric3 · bric3 · commit e24c202b9625 · 2025-10-09T15:04:33.000+02:00
diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle
@@ -9,7 +9,7 @@ plugins {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
-tasks.named("compileJava", JavaCompile).configure {
+tasks.named("compileJava", JavaCompile) {
   configureCompiler(it, 8, JavaVersion.VERSION_1_8, "Need access to sun.* packages")
 }
 
diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
@@ -116,7 +116,7 @@ def generalShadowJarConfig(ShadowJar shadowJarTask) {
 
 def includeShadowJar(TaskProvider<ShadowJar> includedShadowJarTask, String destinationDir) {
   def opentracingFound = new AtomicBoolean()
-  project.processResources {
+  project.tasks.named("processResources", ProcessResources) {
     doFirst {
       eachFile {
         // We seem unlikely to use this name somewhere else.
@@ -147,9 +147,7 @@ def includeShadowJar(TaskProvider<ShadowJar> includedShadowJarTask, String desti
         }
       }
     }
-  }
 
-  project.tasks.named("processResources") {
     dependsOn includedShadowJarTask
   }
 
diff --git a/dd-java-agent/instrumentation/jersey/build.gradle b/dd-java-agent/instrumentation/jersey/build.gradle
@@ -23,7 +23,7 @@ tasks.named("compileJersey3JettyTestGroovy", GroovyCompile) {
   javaLauncher = getJavaLauncherFor(11)
 }
 
-compileTestJava.configure {
+tasks.named("compileTestJava") {
   configureCompiler(it, 11, JavaVersion.VERSION_11)
 }
 
diff --git a/dd-smoke-tests/appsec/springboot-grpc/build.gradle b/dd-smoke-tests/appsec/springboot-grpc/build.gradle
@@ -30,7 +30,10 @@ tasks.withType(Test).configureEach {
 
   def shadowJarTask = project(':dd-smoke-tests:springboot-grpc').tasks.named('shadowJar', ShadowJar)
 
-  jvmArgumentProviders.add({
-    ["-Ddatadog.smoketest.appsec.springboot-grpc.shadowJar.path=${shadowJarTask.get().archiveFile.get()}"]
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+    @Override
+    Iterable<String> asArguments() {
+      return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springboot-grpc.shadowJar.path=${it.archiveFile.get()}"] }.get()
+    }
   })
 }
diff --git a/dd-smoke-tests/play-2.4/build.gradle b/dd-smoke-tests/play-2.4/build.gradle
@@ -87,11 +87,9 @@ tasks.withType(ScalaCompile).configureEach {
   configureCompiler(it, 8)
 }
 
-tasks.withType(AbstractCopyTask).each {
+tasks.withType(AbstractCopyTask).configureEach {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
-  it.configure {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-  }
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 spotless {
diff --git a/dd-smoke-tests/play-2.5/build.gradle b/dd-smoke-tests/play-2.5/build.gradle
@@ -89,11 +89,9 @@ tasks.withType(ScalaCompile).configureEach {
   configureCompiler(it, 8)
 }
 
-tasks.withType(AbstractCopyTask).each {
+tasks.withType(AbstractCopyTask).configureEach {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
-  it.configure {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-  }
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 spotless {
diff --git a/dd-smoke-tests/play-2.6/build.gradle b/dd-smoke-tests/play-2.6/build.gradle
@@ -89,11 +89,9 @@ tasks.withType(ScalaCompile).configureEach {
   configureCompiler(it, 8)
 }
 
-tasks.withType(AbstractCopyTask).each {
+tasks.withType(AbstractCopyTask).configureEach {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
-  it.configure {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-  }
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 spotless {
diff --git a/dd-smoke-tests/play-2.7/build.gradle b/dd-smoke-tests/play-2.7/build.gradle
@@ -89,11 +89,9 @@ tasks.withType(ScalaCompile).configureEach {
   configureCompiler(it, 8)
 }
 
-tasks.withType(AbstractCopyTask).each {
+tasks.withType(AbstractCopyTask).configureEach {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
-  it.configure {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-  }
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 spotless {
diff --git a/dd-smoke-tests/play-2.8-otel/build.gradle b/dd-smoke-tests/play-2.8-otel/build.gradle
@@ -85,11 +85,9 @@ tasks.withType(ScalaCompile).configureEach {
   configureCompiler(it, 8)
 }
 
-tasks.withType(AbstractCopyTask).each {
+tasks.withType(AbstractCopyTask).configureEach {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
-  it.configure {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-  }
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 spotless {
diff --git a/dd-smoke-tests/play-2.8-split-routes/build.gradle b/dd-smoke-tests/play-2.8-split-routes/build.gradle
@@ -85,11 +85,9 @@ tasks.withType(ScalaCompile).configureEach {
   configureCompiler(it, 8)
 }
 
-tasks.withType(AbstractCopyTask).each {
+tasks.withType(AbstractCopyTask).configureEach {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
-  it.configure {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-  }
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 spotless {
diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle
@@ -88,11 +88,9 @@ tasks.withType(ScalaCompile).configureEach {
   configureCompiler(it, 8)
 }
 
-tasks.withType(AbstractCopyTask).each {
+tasks.withType(AbstractCopyTask).configureEach {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
-  it.configure {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-  }
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 spotless {
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
@@ -87,6 +87,6 @@ apply from: "$configPath/spotless/spotless-kotlin.gradle"
 tasks.register('formatCode') {
   dependsOn 'spotlessApply'
 }
-check.configure {
+tasks.named("check").configure {
   dependsOn 'spotlessCheck'
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ plugins {`
`9`	`9`	`apply from: "$rootDir/gradle/java.gradle"`
`10`	`10`	`apply plugin: "idea"`
`11`	`11`
`12`		`-tasks.named("compileJava", JavaCompile).configure {`
	`12`	`+tasks.named("compileJava", JavaCompile) {`
`13`	`13`	`configureCompiler(it, 8, JavaVersion.VERSION_1_8, "Need access to sun.* packages")`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ def generalShadowJarConfig(ShadowJar shadowJarTask) {`
`116`	`116`
`117`	`117`	`def includeShadowJar(TaskProvider<ShadowJar> includedShadowJarTask, String destinationDir) {`
`118`	`118`	`def opentracingFound = new AtomicBoolean()`
`119`		`- project.processResources {`
	`119`	`+ project.tasks.named("processResources", ProcessResources) {`
`120`	`120`	`doFirst {`
`121`	`121`	`eachFile {`
`122`	`122`	`// We seem unlikely to use this name somewhere else.`
`@@ -147,9 +147,7 @@ def includeShadowJar(TaskProvider<ShadowJar> includedShadowJarTask, String desti`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`}`
`150`		`- }`
`151`	`150`
`152`		`- project.tasks.named("processResources") {`
`153`	`151`	`dependsOn includedShadowJarTask`
`154`	`152`	`}`
`155`	`153`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ tasks.named("compileJersey3JettyTestGroovy", GroovyCompile) {`
`23`	`23`	`javaLauncher = getJavaLauncherFor(11)`
`24`	`24`	`}`
`25`	`25`
`26`		`-compileTestJava.configure {`
	`26`	`+tasks.named("compileTestJava") {`
`27`	`27`	`configureCompiler(it, 11, JavaVersion.VERSION_11)`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,9 @@ tasks.withType(ScalaCompile).configureEach {`
`87`	`87`	`configureCompiler(it, 8)`
`88`	`88`	`}`
`89`	`89`
`90`		`-tasks.withType(AbstractCopyTask).each {`
	`90`	`+tasks.withType(AbstractCopyTask).configureEach {`
`91`	`91`	`// Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once`
`92`		`- it.configure {`
`93`		`- duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`94`		`- }`
	`92`	`+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`95`	`93`	`}`
`96`	`94`
`97`	`95`	`spotless {`
Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,9 @@ tasks.withType(ScalaCompile).configureEach {`
`89`	`89`	`configureCompiler(it, 8)`
`90`	`90`	`}`
`91`	`91`
`92`		`-tasks.withType(AbstractCopyTask).each {`
	`92`	`+tasks.withType(AbstractCopyTask).configureEach {`
`93`	`93`	`// Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once`
`94`		`- it.configure {`
`95`		`- duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`96`		`- }`
	`94`	`+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`97`	`95`	`}`
`98`	`96`
`99`	`97`	`spotless {`
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,9 @@ tasks.withType(ScalaCompile).configureEach {`
`85`	`85`	`configureCompiler(it, 8)`
`86`	`86`	`}`
`87`	`87`
`88`		`-tasks.withType(AbstractCopyTask).each {`
	`88`	`+tasks.withType(AbstractCopyTask).configureEach {`
`89`	`89`	`// Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once`
`90`		`- it.configure {`
`91`		`- duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`92`		`- }`
	`90`	`+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`93`	`91`	`}`
`94`	`92`
`95`	`93`	`spotless {`