Allow building with jdk17 (open-telemetry#11303)

hannahchan · May 12, 2024 · 5453eff · 5453eff
1 parent ff39e59
commit 5453eff
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -1,4 +1,3 @@
-import com.gradle.enterprise.gradleplugin.testretry.retry
 import io.opentelemetry.instrumentation.gradle.OtelJavaExtension
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import java.time.Duration
@@ -79,11 +78,6 @@ tasks.withType<JavaCompile>().configureEach {
           "-Werror"
         )
       )
-      val defaultJavaVersion = otelJava.maxJavaVersionSupported.getOrElse(DEFAULT_JAVA_VERSION).majorVersion.toInt()
-      if (Math.max(otelJava.minJavaVersionSupported.get().majorVersion.toInt(), defaultJavaVersion) >= 21) {
-        // new warning in jdk21
-        compilerArgs.add("-Xlint:-this-escape")
-      }
     }
 
     encoding = "UTF-8"
@@ -119,6 +113,12 @@ afterEvaluate {
       source = otelJava.minJavaVersionSupported.get().majorVersion
     }
   }
+  tasks.withType<JavaCompile>().configureEach {
+    if (javaCompiler.isPresent && javaCompiler.get().metadata.languageVersion.canCompileOrRun(21)) {
+      // new warning in jdk21
+      options.compilerArgs.add("-Xlint:-this-escape")
+    }
+  }
 }
 
 evaluationDependsOn(":dependencyManagement")