Skip to content

Commit 5453eff

Browse files
laurithannahchan
authored andcommitted
Allow building with jdk17 (open-telemetry#11303)
1 parent ff39e59 commit 5453eff

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.gradle.enterprise.gradleplugin.testretry.retry
21
import io.opentelemetry.instrumentation.gradle.OtelJavaExtension
32
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
43
import java.time.Duration
@@ -79,11 +78,6 @@ tasks.withType<JavaCompile>().configureEach {
7978
"-Werror"
8079
)
8180
)
82-
val defaultJavaVersion = otelJava.maxJavaVersionSupported.getOrElse(DEFAULT_JAVA_VERSION).majorVersion.toInt()
83-
if (Math.max(otelJava.minJavaVersionSupported.get().majorVersion.toInt(), defaultJavaVersion) >= 21) {
84-
// new warning in jdk21
85-
compilerArgs.add("-Xlint:-this-escape")
86-
}
8781
}
8882

8983
encoding = "UTF-8"
@@ -119,6 +113,12 @@ afterEvaluate {
119113
source = otelJava.minJavaVersionSupported.get().majorVersion
120114
}
121115
}
116+
tasks.withType<JavaCompile>().configureEach {
117+
if (javaCompiler.isPresent && javaCompiler.get().metadata.languageVersion.canCompileOrRun(21)) {
118+
// new warning in jdk21
119+
options.compilerArgs.add("-Xlint:-this-escape")
120+
}
121+
}
122122
}
123123

124124
evaluationDependsOn(":dependencyManagement")

0 commit comments

Comments
 (0)