From a22e267b0568a70168d7fb90669bf98520c7083e Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Tue, 18 Jan 2022 18:26:46 +0300 Subject: [PATCH] [K/N] Set JDK17 as a toolchain for endorsedLibs project Older JDKs sometimes make build fail with obscure errors --- kotlin-native/endorsedLibraries/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kotlin-native/endorsedLibraries/build.gradle b/kotlin-native/endorsedLibraries/build.gradle index c608f3a2f62..15de72a643f 100644 --- a/kotlin-native/endorsedLibraries/build.gradle +++ b/kotlin-native/endorsedLibraries/build.gradle @@ -2,6 +2,7 @@ import org.jetbrains.kotlin.UtilsKt import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask import org.jetbrains.kotlin.EndorsedLibraryInfo import org.jetbrains.kotlin.UtilsKt +import org.jetbrains.kotlin.konan.target.HostManager apply plugin: 'konan' @@ -14,6 +15,10 @@ buildscript { } } +if (HostManager.host.name == "macos_arm64") { + JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_17) +} + ext { endorsedLibraries = [ new EndorsedLibraryInfo(project('kotlinx.cli'), "org.jetbrains.kotlinx.kotlinx-cli")