build: address different JavaCompile and KotlinCompile versions

ragunathjawahar · ragunathjawahar · commit 40ccaae21310 · 2023-07-23T09:38:37.000+05:30
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -54,11 +54,17 @@ subprojects {
     testImplementation(rootProject.testLibs.gson) /* Used by Approvals for pretty-printing JSON */
   }
 
-  val projectTargetsJava16 = this.name == "bytecode-scanner-tests"
-  if (!projectTargetsJava16) {
+  val projectUsesJava16Toolchain = this.name == "bytecode-scanner-tests"
+    || this.name == "bytecode-samples-java"
+  if (!projectUsesJava16Toolchain) {
     tasks.withType<KotlinCompile> {
       kotlinOptions.jvmTarget = "11"
     }
+
+    tasks.withType<JavaCompile> {
+      sourceCompatibility = JavaVersion.VERSION_11.toString()
+      targetCompatibility = JavaVersion.VERSION_11.toString()
+    }
   }
 
   tasks.withType<Test> {

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,17 @@ subprojects {`
`54`	`54`	`testImplementation(rootProject.testLibs.gson) /* Used by Approvals for pretty-printing JSON */`
`55`	`55`	`}`
`56`	`56`
`57`		`- val projectTargetsJava16 = this.name == "bytecode-scanner-tests"`
`58`		`- if (!projectTargetsJava16) {`
	`57`	`+ val projectUsesJava16Toolchain = this.name == "bytecode-scanner-tests"`
	`58`	`+ \|\| this.name == "bytecode-samples-java"`
	`59`	`+ if (!projectUsesJava16Toolchain) {`
`59`	`60`	`tasks.withType<KotlinCompile> {`
`60`	`61`	`kotlinOptions.jvmTarget = "11"`
`61`	`62`	`}`
	`63`	`+`
	`64`	`+ tasks.withType<JavaCompile> {`
	`65`	`+ sourceCompatibility = JavaVersion.VERSION_11.toString()`
	`66`	`+ targetCompatibility = JavaVersion.VERSION_11.toString()`
	`67`	`+ }`
`62`	`68`	`}`
`63`	`69`
`64`	`70`	`tasks.withType<Test> {`