Skip to content

Commit 7c04a1c

Browse files
Fixed Groovy compiler settings.
1 parent 69ccd4a commit 7c04a1c

File tree

4 files changed

+25
-2
lines changed

4 files changed

+25
-2
lines changed

dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,17 @@ tasks.named("compileMain_java11Java", JavaCompile) {
3131
configureCompiler(it, 11, JavaVersion.VERSION_1_8)
3232
}
3333

34+
[
35+
"compileTestGroovy",
36+
"compileJetty11TestGroovy",
37+
"compileLatestDepTestGroovy",
38+
"compileJetty10LatestDepTestGroovy"
39+
].each { taskName ->
40+
tasks.named(taskName, GroovyCompile) {
41+
configureCompiler(it, 11)
42+
}
43+
}
44+
3445
dependencies {
3546
main_java11CompileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.0.0'
3647
main_java11Implementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-common')) {

dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ tasks.named("compileMain_java17Java", JavaCompile) {
1919
configureCompiler(it, 17, JavaVersion.VERSION_17)
2020
}
2121

22-
tasks.named("compileTestGroovy", GroovyCompile) {
23-
configureCompiler(it, 17)
22+
["compileTestGroovy", "compileLatestDepTestGroovy"].each {taskName ->
23+
tasks.named(taskName, GroovyCompile) {
24+
configureCompiler(it, 17)
25+
}
2426
}
2527

2628
configurations.matching { it.name.startsWith('test') || it.name.startsWith('latestDepTest') }.configureEach {

dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,7 @@ tasks.named("compileLatestDepTestJava", JavaCompile) {
6161
configureCompiler(it, 17, JavaVersion.VERSION_1_8)
6262
}
6363

64+
tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
65+
configureCompiler(it, 17)
66+
}
67+

dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,9 @@ dependencies {
4848
exclude group: 'io.undertow', module: 'undertow-websocket-jsr-jakarta'
4949
}
5050
}
51+
52+
["compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each {taskName ->
53+
tasks.named(taskName, GroovyCompile) {
54+
configureCompiler(it, 11)
55+
}
56+
}

0 commit comments

Comments
 (0)