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

[K/N] Set JDK17 as a toolchain for endorsedLibs project

Browse Source 
Older JDKs sometimes make build fail with obscure errors
This commit is contained in:
Pavel Punegov
2022-01-18 18:26:46 +03:00
committed by Space
parent b4c854429f
commit a22e267b05
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/endorsedLibraries/build.gradle
+5
View File
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.UtilsKt
import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask
import org.jetbrains.kotlin.EndorsedLibraryInfo import org.jetbrains.kotlin.EndorsedLibraryInfo
import org.jetbrains.kotlin.UtilsKt import org.jetbrains.kotlin.UtilsKt
import org.jetbrains.kotlin.konan.target.HostManager
apply plugin: 'konan' apply plugin: 'konan'
@@ -14,6 +15,10 @@ buildscript {
} }
} }
if (HostManager.host.name == "macos_arm64") {
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_17)
}
ext { ext {
endorsedLibraries = [ endorsedLibraries = [
new EndorsedLibraryInfo(project('kotlinx.cli'), "org.jetbrains.kotlinx.kotlinx-cli") new EndorsedLibraryInfo(project('kotlinx.cli'), "org.jetbrains.kotlinx.kotlinx-cli")