From 20859a12ec4d78ebac4566eb0e4d270b84b3c076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Doln=C3=ADk?= Date: Tue, 21 May 2024 14:47:02 +0200 Subject: [PATCH] Add support for downloading Konan home from Maven. --- .../touchlab/skie/gradle/util/KotlinNativeCompilerHome.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/KotlinNativeCompilerHome.kt b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/KotlinNativeCompilerHome.kt index 5fd27d2c8..95d0a4aa3 100644 --- a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/KotlinNativeCompilerHome.kt +++ b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/KotlinNativeCompilerHome.kt @@ -22,20 +22,26 @@ private object KotlinNativeDownloaderProperties { const val main = "kotlin.native.version" const val deprecated = "org.jetbrains.kotlin.native.version" + const val downloadFromMaven = "kotlin.native.distribution.downloadFromMaven" } fun Project.kotlinNativeCompilerHome(kotlinVersion: KotlinToolingVersion): File { return NativeCompilerDownloader(project, CompilerVersion.fromString(kotlinVersion.toString())) .also { downloader -> val originalVersionProperty = backupProperty(getKotlinNativeVersionPropertyName()) + val originalDownloadFromMavenProperty = backupProperty(KotlinNativeDownloaderProperties.downloadFromMaven) extra.set(KotlinNativeDownloaderProperties.main, kotlinVersion.toString()) + if (kotlinVersion >= KotlinToolingVersion("1.9.20")) { + extra.set(KotlinNativeDownloaderProperties.downloadFromMaven, "true") + } downloader.downloadIfNeeded() extra.set(KotlinNativeDownloaderProperties.main, null) restoreProperty(originalVersionProperty) + restoreProperty(originalDownloadFromMavenProperty) } .compilerDirectory }