Do not set compiler release by default (remove skipSettingCompilerRelease)

# Conflicts:
#	internal-api/build.gradle was converted to internal-api/build.gradle.kts

Author: smola

dd-java-agent/agent-bootstrap/build.gradle

@@ -4,14 +4,14 @@ plugins {
   id 'me.champeau.jmh'
 }
 
-ext {
-  // need access to sun.* packages
-  skipSettingCompilerRelease = true
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
+tasks.named("compileJava", JavaCompile).configure {
+  // need access to sun.* packages
+  setJavaVersion(it, 8)
+}
+
 // FIXME: Improve test coverage.
 minimumBranchCoverage = 0.0
 minimumInstructionCoverage = 0.0

dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle

@@ -4,8 +4,6 @@ ext {
   // By default tests with be compiled for `minJavaVersionForTests` version,
   // but in this case we would like to avoid this since we would like to run with ZULU8
   skipSettingTestJavaVersion = true
-  // need access to jdk.jfr package
-  skipSettingCompilerRelease = true
   excludeJdk = ['SEMERU11', 'SEMERU17']
 }
 

dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle

@@ -4,9 +4,6 @@ ext {
   // of ByteBuffer.position(int) which is binary incompatible with Java 8 ¯\_(ツ)_/¯
   minJavaVersionForTests = JavaVersion.VERSION_11
 
-  // need access to jdk.jfr package
-  skipSettingCompilerRelease = true
-
   excludeJdk = ['SEMERU11', 'SEMERU17']
 }
 

dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle

@@ -1,9 +1,6 @@
 // Set properties before any plugins get loaded
 ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
-
-  // need access to jdk.jfr package
-  skipSettingCompilerRelease = true
 }
 
 apply from: "$rootDir/gradle/java.gradle"

dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle

@@ -7,8 +7,6 @@ ext {
   // By default tests with be compiled for `minJavaVersionForTests` version,
   // but in this case we would like to avoid this since we would like to run with ZULU8
   skipSettingTestJavaVersion = true
-  // need access to jdk.jfr package
-  skipSettingCompilerRelease = true
 }
 
 apply from: "$rootDir/gradle/java.gradle"
@@ -40,6 +38,10 @@ dependencies {
 [JavaCompile, GroovyCompile].each {
   tasks.withType(it).configureEach {
     setJavaVersion(it, 11)
+    if (it instanceof JavaCompile) {
+      // need access to jdk.jfr package
+      options.release = null
+    }
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
     // Disable '-processing' because some annotations are not claimed.

dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle

@@ -5,8 +5,6 @@ ext {
   // By default tests with be compiled for `minJavaVersionForTests` version,
   // but in this case we would like to avoid this since we would like to run with ORACLE8
   skipSettingTestJavaVersion = true
-  // need access to jdk.jfr package
-  skipSettingCompilerRelease = true
 }
 
 apply from: "$rootDir/gradle/java.gradle"

dd-java-agent/instrumentation/java-concurrent/java-completablefuture/build.gradle

@@ -5,9 +5,6 @@ muzzle {
   }
 }
 
-ext {
-  skipSettingCompilerRelease = true
-}
 apply from: "${rootDir}/gradle/java.gradle"
 
 compileJava {

dd-java-agent/instrumentation/rmi/build.gradle

@@ -1,6 +1,4 @@
 ext {
-  // need access to sun.rmi package
-  skipSettingCompilerRelease = true
   // TODO Java 17: The necessary packages are not opened on Java 17
   maxJavaVersionForTests = JavaVersion.VERSION_15
 }
@@ -13,6 +11,11 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+tasks.withType(JavaCompile).configureEach {
+  // need access to sun.rmi package
+  setJavaVersion(it, 8)
+}
+
 def rmic = tasks.register('rmic', Exec) {
   dependsOn testClasses
 

dd-java-agent/testing/build.gradle

@@ -2,13 +2,13 @@ plugins {
   id 'com.gradleup.shadow'
 }
 
-ext {
+apply from: "$rootDir/gradle/java.gradle"
+
+tasks.withType(JavaCompile).configureEach {
   // need access to sun.misc package
-  skipSettingCompilerRelease = true
+  setJavaVersion(it, 8)
 }
 
-apply from: "$rootDir/gradle/java.gradle"
-
 minimumBranchCoverage = 0.5
 minimumInstructionCoverage = 0.5
 excludedClassesCoverage += [

gradle/java_no_deps.gradle

@@ -47,14 +47,6 @@ if (applyCodeCoverage) {
   apply from: "$rootDir/gradle/jacoco.gradle"
 }
 
-// when building with Java 9+, lazily set compiler --release flag to match target
-def skipSettingCompilerRelease = project.findProperty('skipSettingCompilerRelease')
-if (!skipSettingCompilerRelease && JavaVersion.current().isJava9Compatible()) {
-  compileJava.options.release = project.provider {
-    JavaVersion.toVersion(targetCompatibility).majorVersion as Integer
-  }
-}
-
 if (project.hasProperty('minJavaVersionForTests') && project.getProperty('minJavaVersionForTests') != JavaVersion.VERSION_1_7) {
   def version = JavaVersion.toVersion(project.getProperty('minJavaVersionForTests'))
   def name = "java$version.majorVersion"