wip

DataDog · Aug 26, 2024 · 22bc9a1 · 22bc9a1
1 parent c087327
commit 22bc9a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/dd-java-agent/agent-builder/build.gradle b/dd-java-agent/agent-builder/build.gradle
@@ -21,7 +21,6 @@ sourceSets {
 
 tasks.named("compileMain_java11Java", JavaCompile).configure {
   setJavaVersion(it, 11)
-  options.release = null
   sourceCompatibility = JavaVersion.VERSION_1_8
   targetCompatibility = JavaVersion.VERSION_1_8
 }

diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle
@@ -138,7 +138,7 @@ if (project.hasProperty('minJavaVersionForTests') && project.getProperty('minJav
     }
   }
 
-  "compileMain_${name}Java" {
+  tasks.named("compileMain_${name}Java", JavaCompile).configure {
     sourceCompatibility = version
     targetCompatibility = version
   }
@@ -352,13 +352,17 @@ if (project.hasProperty("removeJarVersionNumbers") && removeJarVersionNumbers) {
 }
 
 tasks.withType(JavaCompile).configureEach {
+  // Skip compileMain_java\d+Java
+  final isJavaVersionSpecific = it.name ==~ /compileMain_java\d+Java/
+  if (!isJavaVersionSpecific) {
   setJavaVersion(it, defaultJdkVersion)
   if (defaultJdkVersion > 8 && !skipSettingCompilerRelease) {
     it.options.release = defaultJavaCompilerRelease
   } else {
     sourceCompatibility = defaultJavaVersion
     targetCompatibility = defaultJavaVersion
   }
+  }
 }
 
 if (project.plugins.hasPlugin('groovy')) {