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
This commit is contained in:
Alexander Udalov
2022-04-06 21:27:58 +02:00
parent 1e800b8e18
commit 2e515f3945
40 changed files with 63 additions and 16 deletions
@@ -7,6 +7,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
dependencies {
api(project(":core:compiler.common"))
kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
}
sourceSets {
+1
View File
@@ -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 {
+1
View File
@@ -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 {
@@ -26,6 +26,8 @@ dependencies {
testApi(projectTests(":generators:test-generator"))
testApi(intellijCore())
kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
}
sourceSets {
+1
View File
@@ -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 {
@@ -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 {
@@ -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 {
+1
View File
@@ -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 {
+1
View File
@@ -7,6 +7,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
dependencies {
api(project(":core:metadata"))
kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
}
sourceSets {
+1
View File
@@ -8,6 +8,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
dependencies {
api(protobufLite())
api(kotlinStdlib())
kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
}
sourceSets {
+1
View File
@@ -7,6 +7,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
dependencies {
compileOnly(kotlinStdlib())
kotlinCompilerClasspath(project(":libraries:tools:stdlib-compiler-classpath"))
}
sourceSets {