Set proper jvmTarget for projects

build.gradle.kts

@@ -1,4 +1,6 @@
+import org.gradle.api.Project
 import java.util.*
+import java.io.File
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.java
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -165,8 +167,14 @@ fun Project.allprojectsRecursive(body: Project.() -> Unit) {
     this.subprojects { allprojectsRecursive(body) }
 }
 
+val defaultJvmTarget = "1.8"
+val defaultJavaHome = jdkPath(defaultJvmTarget!!)
+
 allprojects {
 
+    jvmTarget = defaultJvmTarget
+    javaHome = defaultJavaHome
+
     buildDir = File(commonBuildDir, project.name)
 
     repositories {
@@ -176,10 +184,11 @@ allprojects {
         mavenCentral()
         jcenter()
     }
+    configureJvmProject(javaHome!!, jvmTarget!!)
 
     tasks.withType<KotlinCompile> {
         kotlinOptions.freeCompilerArgs = listOf("-Xallow-kotlin-package", "-module-name", project.name)
-        kotlinOptions.jvmTarget = "1.8"
+//        kotlinOptions.jvmTarget = "1.8"
     }
 
     tasks.withType<Kotlin2JsCompile> {
@@ -197,6 +206,13 @@ allprojects {
     tasks.withType<Jar> {
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
+
+    afterEvaluate {
+        logger.info("configuring project $name to compile to the target jvm version $jvmTarget using jdk: $javaHome")
+        if (javaHome != defaultJavaHome || jvmTarget != defaultJvmTarget) {
+            configureJvmProject(javaHome!!, jvmTarget!!)
+        }
+    }
 }
 
 task<Copy>("dist") {
@@ -288,3 +304,22 @@ fun jdkPath(version: String): String {
     val varName = "JDK_${version.replace(".", "")}"
     return System.getenv(varName) ?: throw GradleException ("Please set environment variable $varName to point to JDK $version installation")
 }
+
+fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
+
+    tasks.withType<JavaCompile> {
+        options.forkOptions.javaHome = file(javaHome)
+    }
+
+    tasks.withType<KotlinCompile> {
+        kotlinOptions.jdkHome = javaHome
+        kotlinOptions.jvmTarget = javaVersion
+        doFirst {
+            System.setProperty("kotlin.colors.enabled", "false")
+        }
+    }
+
+    tasks.withType<Test> {
+        executable = File(javaHome, "bin/java").canonicalPath
+    }
+}

buildSrc/src/main/kotlin/CommonUtil.kt

@@ -65,7 +65,13 @@ fun Project.getResourceFiles(): SourceDirectorySet? = withJavaPlugin {
     the<JavaPluginConvention>().sourceSets.getByName("main").resources
 }
 
-
-
 fun File(root: File, vararg children: String): File = children.fold(root, { f, c -> File(f, c) })
 fun File(root: String, vararg children: String): File = children.fold(File(root), { f, c -> File(f, c) })
+
+var Project.jvmTarget: String?
+    get() = extra.takeIf { it.has("jvmTarget") }?.get("jvmTarget") as? String
+    set(v) { extra["jvmTarget"] = v }
+
+var Project.javaHome: String?
+    get() = extra.takeIf { it.has("javaHome") }?.get("javaHome") as? String
+    set(v) { extra["javaHome"] = v }

compiler/android-tests/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli"))
@@ -21,7 +23,7 @@ dependencies {
 }
 
 sourceSets {
-    "main" { java.srcDirs() }
+    "main" { projectDefault() }
     "test" { projectDefault() }
 }
 

compiler/backend-common/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":core"))
     compile(project(":compiler:util"))

compiler/backend/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:backend-common"))

compiler/build.gradle.kts

@@ -3,6 +3,8 @@ import java.io.File
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 val compilerModules: Array<String> by rootProject.extra
 val otherCompilerModules = compilerModules.filter { it != path }
 

compiler/cli/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))

compiler/cli/cli-common/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":core:util.runtime"))
     compile(project(":compiler:frontend"))

compiler/cli/cli-runner/build.gradle.kts

@@ -3,6 +3,8 @@ description = "Kotlin Runner"
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     val compile by configurations
     compile(project(":kotlin-stdlib"))

compiler/compiler-runner/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":kotlin-build-common"))
     compile(project(":compiler:cli-common"))

compiler/container/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":core:util.runtime"))
     compile(commonDep("javax.inject"))

compiler/daemon/daemon-client/build.gradle.kts

@@ -3,6 +3,8 @@ description = "Kotlin Daemon Client"
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 val nativePlatformUberjar = preloadedDeps("native-platform-uberjar")
 
 dependencies {

compiler/daemon/daemon-common/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":core"))
     compile(project(":compiler:util"))

compiler/frontend.java/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":core"))
     compile(project(":compiler:util"))

compiler/frontend.script/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))

compiler/frontend/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":core"))
     compile(project(":compiler:util"))

compiler/incremental-compilation-impl/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":core"))
     compile(project(":compiler:util"))

compiler/ir/ir.ir2cfg/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))

compiler/ir/ir.psi2ir/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))

compiler/ir/ir.tree/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))

compiler/light-classes/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:backend"))

compiler/plugin-api/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(ideaSdkCoreDeps("intellij-core"))
     compile(project(":compiler:util"))

compiler/preloader/build.gradle.kts

@@ -3,6 +3,8 @@ description = "Kotlin Preloader"
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     val compile by configurations
     compile(ideaSdkDeps("asm-all"))

compiler/resolution/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":core"))

compiler/serialization/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":core"))

core/build.gradle.kts

@@ -4,6 +4,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     val compile by configurations
     compile(project(":core:builtins"))

core/builtins/build.gradle.kts

@@ -7,6 +7,8 @@ import java.io.File
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 val builtinsSrc = File(rootDir, "core", "builtins", "src")
 val builtinsNative = File(rootDir, "core", "builtins", "native")
 // TODO: rewrite dependent projects on using build results instead of the fixed location

core/reflection.jvm/build.gradle.kts

@@ -19,6 +19,8 @@ apply {
     plugin("com.github.johnrengelman.shadow")
 }
 
+jvmTarget = "1.6"
+
 dependencies {
     val compile by configurations
     compile(project(":core:builtins"))

core/script.runtime/build.gradle.kts

@@ -3,6 +3,8 @@ import org.gradle.jvm.tasks.Jar
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     val compile by configurations
     compile(project(":core:builtins"))

core/util.runtime/build.gradle.kts

@@ -4,6 +4,8 @@ apply {
     plugin("kotlin")
 }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":core:builtins"))
     compile(project(":kotlin-stdlib"))

libraries/commonConfiguration.gradle

@@ -43,6 +43,9 @@ ext.configureJvmProject = { Project project ->
 
 ext.configureJvm6Project = { Project project ->
     project.configure(project) {
+        project.ext.jvmTarget = "1.6"
+        project.ext.javaHome = JDK_16
+
         task sourcesJar(type: Jar, dependsOn: classes) {
             classifier = 'sources'
             from sourceSets.main.kotlin

libraries/stdlib/jre7/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'kotlin'
 
 configureJvm6Project(project)
 configurePublishing(project)
+ext.javaHome = JDK_17
 
 dependencies {
     compile project(':kotlin-stdlib')

libraries/stdlib/jre8/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'kotlin'
 
 configureJvm6Project(project)
 configurePublishing(project)
+ext.javaHome = JDK_18
 
 dependencies {
     compile project(':kotlin-stdlib')