From 2e515f39456be7a8a0f9e15b9456c883b032375e Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Wed, 6 Apr 2022 21:27:58 +0200
Subject: [PATCH] Prohibit JVM target 1.6

But still compile stdlib, reflect, kotlin.test and scripting runtimes
with JVM target 1.6 to simplify migration from Kotlin 1.6 to 1.7.

 #KT-45165 Fixed
---
 .../kotlin/cli/common/arguments/DefaultValues.kt         | 2 +-
 .../cli/common/arguments/K2JVMCompilerArguments.kt       | 5 +++--
 .../cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt | 9 ++++++---
 .../src/org/jetbrains/kotlin/config/JvmTarget.kt         | 3 +++
 compiler/testData/cli/jvm/extraHelp.out                  | 3 ++-
 compiler/testData/cli/jvm/help.out                       | 2 +-
 compiler/testData/cli/jvm/jvm6Target.out                 | 4 ++--
 compiler/testData/cli/jvm/jvmDefaultAll.out              | 2 +-
 compiler/tests-common-jvm6/build.gradle.kts              | 1 +
 core/compiler.common.jvm/build.gradle.kts                | 1 +
 core/compiler.common/build.gradle.kts                    | 1 +
 core/descriptors.jvm/build.gradle.kts                    | 1 +
 core/descriptors.runtime/build.gradle.kts                | 2 ++
 core/descriptors/build.gradle.kts                        | 1 +
 core/deserialization.common.jvm/build.gradle.kts         | 1 +
 core/deserialization.common/build.gradle.kts             | 1 +
 core/deserialization/build.gradle.kts                    | 1 +
 core/metadata.jvm/build.gradle.kts                       | 1 +
 core/metadata/build.gradle.kts                           | 1 +
 core/util.runtime/build.gradle.kts                       | 1 +
 libraries/kotlin.test/annotations-common/build.gradle    | 3 ++-
 libraries/kotlin.test/common/build.gradle                | 1 +
 libraries/kotlin.test/junit/build.gradle                 | 1 +
 libraries/kotlin.test/jvm/build.gradle                   | 1 +
 libraries/kotlin.test/testng/build.gradle                | 1 +
 libraries/reflect/api/build.gradle                       | 1 +
 libraries/scripting/common/build.gradle.kts              | 1 +
 libraries/scripting/dependencies-maven/build.gradle.kts  | 1 +
 libraries/scripting/dependencies/build.gradle.kts        | 1 +
 libraries/scripting/jvm/build.gradle.kts                 | 1 +
 libraries/stdlib/jdk7/build.gradle                       | 1 +
 libraries/stdlib/jvm-minimal-for-test/build.gradle.kts   | 1 +
 libraries/stdlib/jvm/build.gradle                        | 2 ++
 libraries/tools/kotlin-annotations-jvm/build.gradle      | 1 +
 .../jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt   | 2 +-
 .../org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt  | 4 ++--
 libraries/tools/script-runtime/build.gradle              | 1 +
 .../tools/stdlib-compiler-classpath/build.gradle.kts     | 9 +++++++++
 .../resources/META-INF/unsafe-allow-jvm6                 | 0
 settings.gradle                                          | 3 ++-
 40 files changed, 63 insertions(+), 16 deletions(-)
 create mode 100644 libraries/tools/stdlib-compiler-classpath/build.gradle.kts
 create mode 100644 libraries/tools/stdlib-compiler-classpath/resources/META-INF/unsafe-allow-jvm6

diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
index 3afaf9c0f77..82e5d12dbec 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/DefaultValues.kt
@@ -37,7 +37,7 @@ open class DefaultValues(val defaultValue: String, val possibleValues: List<Stri
 
     object JvmTargetVersions : DefaultValues(
         "null",
-        JvmTarget.values().map { "\"${it.description}\"" }
+        JvmTarget.supportedValues().map { "\"${it.description}\"" }
     )
 
     object JsEcmaVersions : DefaultValues(
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
index 8428405e9f1..21f4d15c16b 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
@@ -75,7 +75,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
     @Argument(
         value = "-jvm-target",
         valueDescription = "<version>",
-        description = "Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, ..., 18), default is 1.8"
+        description = "Target version of the generated JVM bytecode (1.8, 9, 10, ..., 18), default is 1.8"
     )
     var jvmTarget: String? by NullableStringFreezableVar(null)
 
@@ -466,7 +466,8 @@ Also sets `-jvm-target` value equal to the selected JDK version"""
 
     @Argument(
         value = "-Xsuppress-deprecated-jvm-target-warning",
-        description = "Suppress deprecation warning about deprecated JVM target versions"
+        description = "Suppress deprecation warning about deprecated JVM target versions.\n" +
+                "This option has no effect and will be deleted in a future version."
     )
     var suppressDeprecatedJvmTargetWarning: Boolean by FreezableVar(false)
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
index 66eaf0b7d26..49d82b2a475 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
@@ -56,10 +56,10 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
         val jvmTarget = JvmTarget.fromString(jvmTargetValue)
         if (jvmTarget != null) {
             put(JVMConfigurationKeys.JVM_TARGET, jvmTarget)
-            if (jvmTarget == JvmTarget.JVM_1_6 && !arguments.suppressDeprecatedJvmTargetWarning) {
+            if (jvmTarget == JvmTarget.JVM_1_6 && !isJvmTarget6Allowed()) {
                 messageCollector.report(
-                    STRONG_WARNING,
-                    "JVM target 1.6 is deprecated and will be removed in a future release. Please migrate to JVM target 1.8 or above"
+                    ERROR,
+                    "JVM target 1.6 is no longer supported. Please migrate to JVM target 1.8 or above"
                 )
             }
         } else {
@@ -353,3 +353,6 @@ private val CompilerConfiguration.messageCollector: MessageCollector
 
 private fun getJavaVersion(): Int =
     System.getProperty("java.specification.version")?.substringAfter('.')?.toIntOrNull() ?: 6
+
+private fun isJvmTarget6Allowed(): Boolean =
+    K2JVMCompiler::class.java.classLoader.getResource("META-INF/unsafe-allow-jvm6") != null
diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt
index 2a219195a56..50c154e5300 100644
--- a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt
+++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt
@@ -55,5 +55,8 @@ enum class JvmTarget(
             return if (platformDescription != null) "JVM target $platformDescription"
             else "JVM bytecode version $majorVersion"
         }
+
+        fun supportedValues(): List<JvmTarget> =
+            values().asList() - JVM_1_6
     }
 }
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index c5fb0eeaae0..07cecb5b8cb 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -131,7 +131,8 @@ where advanced options include:
                              Specify behavior for Checker Framework compatqual annotations (NullableDecl/NonNullDecl).
                              Default value is 'enable'
   -Xsuppress-deprecated-jvm-target-warning
-                             Suppress deprecation warning about deprecated JVM target versions
+                             Suppress deprecation warning about deprecated JVM target versions.
+                             This option has no effect and will be deleted in a future version.
   -Xsuppress-missing-builtins-error
                              Suppress the "cannot access built-in declaration" error (useful with -no-stdlib)
   -Xtype-enhancement-improvements-strict-mode
diff --git a/compiler/testData/cli/jvm/help.out b/compiler/testData/cli/jvm/help.out
index 5101c1efac5..7f8e024961a 100644
--- a/compiler/testData/cli/jvm/help.out
+++ b/compiler/testData/cli/jvm/help.out
@@ -6,7 +6,7 @@ where possible options include:
   -include-runtime           Include Kotlin runtime into the resulting JAR
   -java-parameters           Generate metadata for Java 1.8 reflection on method parameters
   -jdk-home <path>           Include a custom JDK from the specified location into the classpath instead of the default JAVA_HOME
-  -jvm-target <version>      Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, ..., 18), default is 1.8
+  -jvm-target <version>      Target version of the generated JVM bytecode (1.8, 9, 10, ..., 18), default is 1.8
   -module-name <name>        Name of the generated .kotlin_module file
   -no-jdk                    Don't automatically include the Java runtime into the classpath
   -no-reflect                Don't automatically include Kotlin reflection into the classpath
diff --git a/compiler/testData/cli/jvm/jvm6Target.out b/compiler/testData/cli/jvm/jvm6Target.out
index ea521634a30..06dc61dfefe 100644
--- a/compiler/testData/cli/jvm/jvm6Target.out
+++ b/compiler/testData/cli/jvm/jvm6Target.out
@@ -1,2 +1,2 @@
-warning: JVM target 1.6 is deprecated and will be removed in a future release. Please migrate to JVM target 1.8 or above
-OK
+error: JVM target 1.6 is no longer supported. Please migrate to JVM target 1.8 or above
+COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/jvmDefaultAll.out b/compiler/testData/cli/jvm/jvmDefaultAll.out
index c33fbbd9084..d3dd4a63a04 100644
--- a/compiler/testData/cli/jvm/jvmDefaultAll.out
+++ b/compiler/testData/cli/jvm/jvmDefaultAll.out
@@ -1,3 +1,3 @@
-warning: JVM target 1.6 is deprecated and will be removed in a future release. Please migrate to JVM target 1.8 or above
+error: JVM target 1.6 is no longer supported. Please migrate to JVM target 1.8 or above
 error: '-Xjvm-default=all' is only supported since JVM target 1.8. Recompile with '-jvm-target 1.8'
 COMPILATION_ERROR
diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts
index a52c4b35c61..a31857853da 100644
--- a/compiler/tests-common-jvm6/build.gradle.kts
+++ b/compiler/tests-common-jvm6/build.gradle.kts
@@ -8,6 +8,7 @@ project.updateJvmTarget("1.6")
 dependencies {
     api(kotlinStdlib())
     testApi(project(":kotlin-test:kotlin-test-jvm"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/compiler.common.jvm/build.gradle.kts b/core/compiler.common.jvm/build.gradle.kts
index a87c74b4449..b17b84c077f 100644
--- a/core/compiler.common.jvm/build.gradle.kts
+++ b/core/compiler.common.jvm/build.gradle.kts
@@ -7,6 +7,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 
 dependencies {
     api(project(":core:compiler.common"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/compiler.common/build.gradle.kts b/core/compiler.common/build.gradle.kts
index e8022e8d91b..7e58c26be49 100644
--- a/core/compiler.common/build.gradle.kts
+++ b/core/compiler.common/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
     api(project(":core:util.runtime"))
     api(kotlinStdlib())
     api(project(":kotlin-annotations-jvm"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts
index 8e2767dbf1d..bd187c3fe92 100644
--- a/core/descriptors.jvm/build.gradle.kts
+++ b/core/descriptors.jvm/build.gradle.kts
@@ -13,6 +13,7 @@ dependencies {
     api(project(":core:deserialization.common.jvm"))
     api(project(":core:util.runtime"))
     api(commonDependency("javax.inject"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index dd2989128c1..e9cf34ab4bd 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -26,6 +26,8 @@ dependencies {
     testApi(projectTests(":generators:test-generator"))
 
     testApi(intellijCore())
+
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index c39470e3d59..e58faa6e3bb 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     api(project(":core:util.runtime"))
     api(kotlinStdlib())
     api(project(":kotlin-annotations-jvm"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/deserialization.common.jvm/build.gradle.kts b/core/deserialization.common.jvm/build.gradle.kts
index 70bfe2d567b..deb7f91fcb0 100644
--- a/core/deserialization.common.jvm/build.gradle.kts
+++ b/core/deserialization.common.jvm/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
     api(project(":core:metadata.jvm"))
     api(project(":core:deserialization.common"))
     implementation(project(":core:compiler.common.jvm"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/deserialization.common/build.gradle.kts b/core/deserialization.common/build.gradle.kts
index ccbc08528a1..ab564432c96 100644
--- a/core/deserialization.common/build.gradle.kts
+++ b/core/deserialization.common/build.gradle.kts
@@ -8,6 +8,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 dependencies {
     api(project(":core:compiler.common"))
     api(project(":core:metadata"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts
index 6340eb559f7..c96a52f41e6 100644
--- a/core/deserialization/build.gradle.kts
+++ b/core/deserialization/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     api(project(":core:util.runtime"))
     api(project(":core:descriptors"))
     api(commonDependency("javax.inject"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts
index 42d6971504c..9f01714c62c 100644
--- a/core/metadata.jvm/build.gradle.kts
+++ b/core/metadata.jvm/build.gradle.kts
@@ -7,6 +7,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 
 dependencies {
     api(project(":core:metadata"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts
index 2c057f87691..e1d6ce3b8d7 100644
--- a/core/metadata/build.gradle.kts
+++ b/core/metadata/build.gradle.kts
@@ -8,6 +8,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 dependencies {
     api(protobufLite())
     api(kotlinStdlib())
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/core/util.runtime/build.gradle.kts b/core/util.runtime/build.gradle.kts
index 6f234688663..3826ffa75ab 100644
--- a/core/util.runtime/build.gradle.kts
+++ b/core/util.runtime/build.gradle.kts
@@ -7,6 +7,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 
 dependencies {
     compileOnly(kotlinStdlib())
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle
index ff7cfeb82f2..e026b854d08 100644
--- a/libraries/kotlin.test/annotations-common/build.gradle
+++ b/libraries/kotlin.test/annotations-common/build.gradle
@@ -7,6 +7,7 @@ JvmToolchain.updateJvmTarget(project, "1.6")
 dependencies {
     api kotlinStdlib("common")
     testApi project(":kotlin-test:kotlin-test-common")
+    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
@@ -18,4 +19,4 @@ jar {
 }
 
 configureSourcesJar()
-configureJavadocJar()
\ No newline at end of file
+configureJavadocJar()
diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle
index 75a4e84bed5..f24719034cb 100644
--- a/libraries/kotlin.test/common/build.gradle
+++ b/libraries/kotlin.test/common/build.gradle
@@ -7,6 +7,7 @@ JvmToolchain.updateJvmTarget(project, "1.6")
 dependencies {
     api kotlinStdlib("common")
     testApi project(":kotlin-test:kotlin-test-annotations-common")
+    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 jar {
diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle
index 76d00f39d1e..3c234291389 100644
--- a/libraries/kotlin.test/junit/build.gradle
+++ b/libraries/kotlin.test/junit/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
     api project(':kotlin-test:kotlin-test-jvm')
     api('junit:junit:4.13.2')
+    kotlinCompilerClasspath(project(':libraries:tools:stdlib-compiler-classpath'))
 }
 
 
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index c5cd642a77a..4337822b0ca 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -19,6 +19,7 @@ dependencies {
     api(kotlinStdlib())
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testApi('junit:junit:4.13.2')
+    kotlinCompilerClasspath(project(':libraries:tools:stdlib-compiler-classpath'))
 }
 
 jar {
diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle
index 2a69163372b..7ff56884ee2 100644
--- a/libraries/kotlin.test/testng/build.gradle
+++ b/libraries/kotlin.test/testng/build.gradle
@@ -20,6 +20,7 @@ dependencies {
     if (includeJava9) {
         java9CompileOnly('org.testng:testng:7.0.0')
     }
+    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 jar {
diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle
index 9a9e2e263cc..e1c37395e83 100644
--- a/libraries/reflect/api/build.gradle
+++ b/libraries/reflect/api/build.gradle
@@ -29,6 +29,7 @@ dependencies {
     compileOnly project(':core:descriptors.runtime')
     compileOnly project(':core:util.runtime')
     compileOnly "org.jetbrains:annotations:13.0"
+    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 if (includeJava9) {
diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts
index 2b073a2ee75..273de87c656 100644
--- a/libraries/scripting/common/build.gradle.kts
+++ b/libraries/scripting/common/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
     api(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     testApi(commonDependency("junit"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/dependencies-maven/build.gradle.kts b/libraries/scripting/dependencies-maven/build.gradle.kts
index 44c14238108..5e6d894fbf0 100644
--- a/libraries/scripting/dependencies-maven/build.gradle.kts
+++ b/libraries/scripting/dependencies-maven/build.gradle.kts
@@ -34,6 +34,7 @@ dependencies {
     testRuntimeOnly("org.slf4j:slf4j-nop:1.7.30")
     testImplementation(kotlin("reflect"))
     testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/dependencies/build.gradle.kts b/libraries/scripting/dependencies/build.gradle.kts
index 728c14c2136..7752eda8170 100644
--- a/libraries/scripting/dependencies/build.gradle.kts
+++ b/libraries/scripting/dependencies/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     api(project(":kotlin-scripting-common"))
     testApi(commonDependency("junit"))
     testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts
index b019def9fd9..6783525ac61 100644
--- a/libraries/scripting/jvm/build.gradle.kts
+++ b/libraries/scripting/jvm/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     api(kotlinStdlib())
     api(project(":kotlin-scripting-common"))
     testApi(commonDependency("junit"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index ffcce3c6e83..7558ac8ee98 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -44,6 +44,7 @@ configurations {
 dependencies {
     api project(':kotlin-stdlib')
     testApi project(':kotlin-test:kotlin-test-junit')
+    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 jar {
diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
index c5e7fe35cdb..46e3b4afc31 100644
--- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
@@ -20,6 +20,7 @@ val builtins by configurations.creating {
 dependencies {
     compileOnly(project(":kotlin-stdlib"))
     builtins(project(":core:builtins"))
+    kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
 }
 
 sourceSets {
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index ad951330b7e..aa9d263a563 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -63,6 +63,8 @@ dependencies {
     testApi project(':kotlin-test:kotlin-test-junit')
 
     builtins project(':core:builtins')
+
+    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 jar {
diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle
index 7b09125614b..f6ca223e6f4 100644
--- a/libraries/tools/kotlin-annotations-jvm/build.gradle
+++ b/libraries/tools/kotlin-annotations-jvm/build.gradle
@@ -16,6 +16,7 @@ sourceSets {
 
 dependencies {
     compileOnly DependenciesKt.kotlinBuiltins(project)
+    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 configureSourcesJar()
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
index 38569e4f1bc..311c41400d6 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
@@ -24,4 +24,4 @@ interface KotlinCommonOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo
      * Default value: false
      */
      var useFir: kotlin.Boolean
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
index 0fee3e0726e..4b0384cfdce 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
@@ -12,8 +12,8 @@ interface KotlinJvmOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOption
      var javaParameters: kotlin.Boolean
 
     /**
-     * Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, ..., 18), default is 1.8
-     * Possible values: "1.6", "1.8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18"
+     * Target version of the generated JVM bytecode (1.8, 9, 10, ..., 18), default is 1.8
+     * Possible values: "1.8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18"
      * Default value: null
      */
      var jvmTarget: kotlin.String?
diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle
index f05d7629e00..f6586f3c1d3 100644
--- a/libraries/tools/script-runtime/build.gradle
+++ b/libraries/tools/script-runtime/build.gradle
@@ -8,6 +8,7 @@ configurePublishing(project)
 
 dependencies {
     compileOnly kotlinStdlib()
+    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 sourceSets {
diff --git a/libraries/tools/stdlib-compiler-classpath/build.gradle.kts b/libraries/tools/stdlib-compiler-classpath/build.gradle.kts
new file mode 100644
index 00000000000..fcb81bccaa6
--- /dev/null
+++ b/libraries/tools/stdlib-compiler-classpath/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+    java
+    id("jps-compatible")
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
diff --git a/libraries/tools/stdlib-compiler-classpath/resources/META-INF/unsafe-allow-jvm6 b/libraries/tools/stdlib-compiler-classpath/resources/META-INF/unsafe-allow-jvm6
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/settings.gradle b/settings.gradle
index 99a1285dceb..625ada1b826 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -313,7 +313,8 @@ include ":benchmarks",
         ":kotlinx-serialization-compiler-plugin",
         ":kotlin-serialization",
         ":kotlin-serialization-unshaded",
-        ":wasm:wasm.ir"
+        ":wasm:wasm.ir",
+        ":libraries:tools:stdlib-compiler-classpath"
 
 
 include ":kotlinx-atomicfu-compiler-plugin",