diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompilerDownloadTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompilerDownloadTask.kt index 308eaf20e33..f6a9708845f 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompilerDownloadTask.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompilerDownloadTask.kt @@ -33,7 +33,7 @@ open class KonanCompilerDownloadTask : DefaultTask() { @TaskAction fun downloadAndExtract() { - if (project.hasProperty(KonanPlugin.KONAN_HOME_PROPERTY_NAME)) { + if (!project.hasProperty(KonanPlugin.DOWNLOAD_COMPILER_PROPERTY_NAME)) { val konanHome = project.property(KonanPlugin.KONAN_HOME_PROPERTY_NAME) logger.info("Use a user-defined compiler path: $konanHome") return diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt index b516b33b622..9869f70732c 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt @@ -191,6 +191,8 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR internal const val KONAN_BUILD_TARGETS = "konan.build.targets" internal const val DEFAULT_KONAN_VERSION = "0.3" + + internal const val DOWNLOAD_COMPILER_PROPERTY_NAME = "DownloadCompiler" } /** @@ -219,6 +221,7 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR project.extensions.add(INTEROP_EXTENSION_NAME, KonanInteropContainer(project)) if (!project.extensions.extraProperties.has(KonanPlugin.KONAN_HOME_PROPERTY_NAME)) { project.extensions.extraProperties.set(KonanPlugin.KONAN_HOME_PROPERTY_NAME, project.konanCompilerDownloadDir()) + project.extensions.extraProperties.set(DOWNLOAD_COMPILER_PROPERTY_NAME, true) } if (!project.extensions.extraProperties.has(KonanPlugin.KONAN_BUILD_TARGETS)) { project.extensions.extraProperties.set(KonanPlugin.KONAN_BUILD_TARGETS, project.host)