azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch JVM target of the standard libraries to 1.8 #KT-51907

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2022-07-11 22:58:30 +03:00
parent 54980ce0d5
commit 34e50649e8
28 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compiler.common.jvm/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:compiler.common"))
core/compiler.common/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:util.runtime"))
core/descriptors.jvm/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":kotlin-annotations-jvm"))
core/descriptors.runtime/build.gradle.kts
+1 -11
View File
@@ -5,17 +5,7 @@ plugins {
id("jps-compatible")
}
tasks
.matching { it.name == "compileKotlin" && it is KotlinCompile }
.configureEach {
(this as KotlinCompile).configureTaskToolchain(chooseJdk18ForJpsBuild(JdkMajorVersion.JDK_1_6))
}
tasks
.matching { it.name == "compileJava" && it is JavaCompile }
.configureEach {
(this as JavaCompile).configureTaskToolchain(chooseJdk18ForJpsBuild(JdkMajorVersion.JDK_1_6))
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
compileOnly(project(":core:util.runtime"))
core/descriptors/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:compiler.common"))
core/deserialization.common.jvm/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:metadata.jvm"))
core/deserialization.common/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:compiler.common"))
core/deserialization/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:metadata"))
core/metadata.jvm/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:metadata"))
core/metadata/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(protobufLite())
core/util.runtime/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
compileOnly(kotlinStdlib())