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

Build: Use jdk-release compiler option to build kotlin-stdlib

Browse Source 
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
This commit is contained in:
Vyacheslav Gerasimov
2024-03-17 13:41:59 +01:00
committed by Space Team
parent e9d5396fa9
commit 069c920a5c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/build.gradle.kts
+4 -2
View File
@@ -113,13 +113,14 @@ kotlin {
val main by getting { val main by getting {
compileTaskProvider.configure { compileTaskProvider.configure {
this as UsesKotlinJavaToolchain this as UsesKotlinJavaToolchain
kotlinJavaToolchain.toolchain.use(getToolchainLauncherFor(JdkMajorVersion.JDK_1_6)) kotlinJavaToolchain.toolchain.use(getToolchainLauncherFor(JdkMajorVersion.JDK_11_0))
compilerOptions { compilerOptions {
moduleName = "kotlin-stdlib" moduleName = "kotlin-stdlib"
jvmTarget = JvmTarget.JVM_1_8 jvmTarget = JvmTarget.JVM_1_8
// providing exhaustive list of args here // providing exhaustive list of args here
freeCompilerArgs.set( freeCompilerArgs.set(
listOfNotNull( listOfNotNull(
"-Xjdk-release=6",
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xexpect-actual-classes", "-Xexpect-actual-classes",
"-Xmultifile-parts-inherit", "-Xmultifile-parts-inherit",
@@ -142,12 +143,13 @@ kotlin {
associateWith(main) associateWith(main)
compileTaskProvider.configure { compileTaskProvider.configure {
this as UsesKotlinJavaToolchain this as UsesKotlinJavaToolchain
kotlinJavaToolchain.toolchain.use(getToolchainLauncherFor(JdkMajorVersion.JDK_1_7)) kotlinJavaToolchain.toolchain.use(getToolchainLauncherFor(JdkMajorVersion.JDK_11_0))
compilerOptions { compilerOptions {
moduleName = "kotlin-stdlib-jdk7" moduleName = "kotlin-stdlib-jdk7"
jvmTarget = JvmTarget.JVM_1_8 jvmTarget = JvmTarget.JVM_1_8
freeCompilerArgs.set( freeCompilerArgs.set(
listOfNotNull( listOfNotNull(
"-Xjdk-release=7",
"-Xallow-kotlin-package", "-Xallow-kotlin-package",
"-Xexpect-actual-classes", "-Xexpect-actual-classes",
"-Xmultifile-parts-inherit", "-Xmultifile-parts-inherit",
libraries/stdlib/jdk7/build.gradle
+2 -1
View File
@@ -44,9 +44,10 @@ artifacts {
} }
compileKotlin { 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.jvmTarget = "1.8"
kotlinOptions.moduleName = project.name kotlinOptions.moduleName = project.name
kotlinOptions.freeCompilerArgs = [ "-Xjdk-release=7" ]
} }
compileTestKotlin { compileTestKotlin {