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

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()
+configureJavadocJar()

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 {

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'))
 }
 
 

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 {

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 {

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) {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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()

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
-}
+}

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?

libraries/tools/script-runtime/build.gradle

@@ -8,6 +8,7 @@ configurePublishing(project)
 
 dependencies {
     compileOnly kotlinStdlib()
+    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 sourceSets {

libraries/tools/stdlib-compiler-classpath/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    java
+    id("jps-compatible")
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}