fix: Make resilience4j modules use configureCompiler

bric3 · bric3 · commit f1626ee15496 · 2025-10-01T01:29:21.000+02:00
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle
@@ -21,13 +21,13 @@ idea {
   }
 }
 
-// Set all compile tasks to use JDK17 but let instrumentation code target 1.8 compatibility
 project.tasks.withType(AbstractCompile).configureEach {
-  setJavaVersion(it, 17)
-}
-compileJava.configure {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
+  configureCompiler(
+    it,
+    17,
+    JavaVersion.VERSION_1_8,
+    "Set all compile tasks to use JDK17 but let instrumentation code target 1.8 compatibility"
+    )
 }
 
 addTestSuiteForDir('latestDepTest', 'test')
diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle
@@ -23,11 +23,12 @@ idea {
 
 // Set all compile tasks to use JDK17 but let instrumentation code target 1.8 compatibility
 project.tasks.withType(AbstractCompile).configureEach {
-  setJavaVersion(it, 17)
-}
-compileJava.configure {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
+  configureCompiler(
+    it,
+    17,
+    JavaVersion.VERSION_1_8,
+    "Set all compile tasks to use JDK17 but let instrumentation code target 1.8 compatibility"
+  )
 }
 
 addTestSuiteForDir('latestDepTest', 'test')

Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ idea {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-// Set all compile tasks to use JDK17 but let instrumentation code target 1.8 compatibility`
`25`	`24`	`project.tasks.withType(AbstractCompile).configureEach {`
`26`		`- setJavaVersion(it, 17)`
`27`		`-}`
`28`		`-compileJava.configure {`
`29`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`30`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`25`	`+ configureCompiler(`
	`26`	`+ it,`
	`27`	`+ 17,`
	`28`	`+ JavaVersion.VERSION_1_8,`
	`29`	`+ "Set all compile tasks to use JDK17 but let instrumentation code target 1.8 compatibility"`
	`30`	`+ )`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`addTestSuiteForDir('latestDepTest', 'test')`