From 069c920a5c0969ddd34011a198e78ebe9015c67d Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Sun, 17 Mar 2024 13:41:59 +0100
Subject: [PATCH] Build: Use `jdk-release` compiler option to build
 kotlin-stdlib

Use JDK11 with `-Xjdk-release=6` for kotlin-stdlib.
Use JDK11 with `-Xjdk-release=7` for kotlin-stdlib-jdk7.
This allows dropping JDK6 and JDK7 from our build completely and remove
`kotlin.build.isObsoleteJdkOverrideEnabled` #KTI-1220.

 #KT-57808
---
 libraries/stdlib/build.gradle.kts  | 6 ++++--
 libraries/stdlib/jdk7/build.gradle | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts
index 5e5b8bbaa68..df3c665fca2 100644
--- a/libraries/stdlib/build.gradle.kts
+++ b/libraries/stdlib/build.gradle.kts
@@ -113,13 +113,14 @@ kotlin {
             val main by getting {
                 compileTaskProvider.configure {
                     this as UsesKotlinJavaToolchain
-                    kotlinJavaToolchain.toolchain.use(getToolchainLauncherFor(JdkMajorVersion.JDK_1_6))
+                    kotlinJavaToolchain.toolchain.use(getToolchainLauncherFor(JdkMajorVersion.JDK_11_0))
                     compilerOptions {
                         moduleName = "kotlin-stdlib"
                         jvmTarget = JvmTarget.JVM_1_8
                         // providing exhaustive list of args here
                         freeCompilerArgs.set(
                             listOfNotNull(
+                                "-Xjdk-release=6",
                                 "-Xallow-kotlin-package",
                                 "-Xexpect-actual-classes",
                                 "-Xmultifile-parts-inherit",
@@ -142,12 +143,13 @@ kotlin {
                 associateWith(main)
                 compileTaskProvider.configure {
                     this as UsesKotlinJavaToolchain
-                    kotlinJavaToolchain.toolchain.use(getToolchainLauncherFor(JdkMajorVersion.JDK_1_7))
+                    kotlinJavaToolchain.toolchain.use(getToolchainLauncherFor(JdkMajorVersion.JDK_11_0))
                     compilerOptions {
                         moduleName = "kotlin-stdlib-jdk7"
                         jvmTarget = JvmTarget.JVM_1_8
                         freeCompilerArgs.set(
                             listOfNotNull(
+                                "-Xjdk-release=7",
                                 "-Xallow-kotlin-package",
                                 "-Xexpect-actual-classes",
                                 "-Xmultifile-parts-inherit",
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index ebd9b75800b..cc1b309b1fc 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -44,9 +44,10 @@ artifacts {
 }
 
 compileKotlin {
-    kotlinJavaToolchain.toolchain.use(JvmToolchain.getToolchainLauncherFor(project, JdkMajorVersion.JDK_1_7))
+    kotlinJavaToolchain.toolchain.use(JvmToolchain.getToolchainLauncherFor(project, JdkMajorVersion.JDK_11_0))
     kotlinOptions.jvmTarget = "1.8"
     kotlinOptions.moduleName = project.name
+    kotlinOptions.freeCompilerArgs = [ "-Xjdk-release=7" ]
 }
 
 compileTestKotlin {