From 90331bfad5a810d43a98cb3687ebc973a9cf387f Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Mon, 26 Jun 2017 18:10:40 +0700
Subject: [PATCH] gradle-plugin: Use konanVersion as a default compiler version

---
 tools/kotlin-native-gradle-plugin/build.gradle            | 8 ++------
 .../org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt     | 6 +++++-
 .../resources/META-INF/gradle-plugins/konan.properties    | 3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle
index 734cc8d4bd1..835f6520588 100644
--- a/tools/kotlin-native-gradle-plugin/build.gradle
+++ b/tools/kotlin-native-gradle-plugin/build.gradle
@@ -60,12 +60,8 @@ jar {
     from (rootProject.findProject(':shared').sourceSets.main.output)
 }
 
-task deleteDist(type: Delete) {
-    delete 'dist'
-}
-
-clean {
-    dependsOn 'deleteDist'
+processResources {
+    expand('konanVersion': konanVersion)
 }
 
 publishing {
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 ca6ad930212..e82ef41cc96 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
@@ -26,6 +26,7 @@ import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.tasks.TaskCollection
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
+import java.util.*
 import javax.inject.Inject
 
 /**
@@ -191,7 +192,10 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR
         internal const val KONAN_VERSION_PROPERTY_NAME = "konan.version"
         internal const val KONAN_BUILD_TARGETS = "konan.build.targets"
 
-        internal const val DEFAULT_KONAN_VERSION = "0.3"
+        internal val DEFAULT_KONAN_VERSION = Properties().apply {
+            load(KonanPlugin::class.java.getResourceAsStream("/META-INF/gradle-plugins/konan.properties") ?:
+                throw RuntimeException("Cannot find a properties file"))
+        }.getProperty("default-konan-version") ?: throw RuntimeException("Cannot read the default compiler version")
 
         internal const val DOWNLOAD_COMPILER_PROPERTY_NAME = "DownloadCompiler"
     }
diff --git a/tools/kotlin-native-gradle-plugin/src/main/resources/META-INF/gradle-plugins/konan.properties b/tools/kotlin-native-gradle-plugin/src/main/resources/META-INF/gradle-plugins/konan.properties
index 7275083968d..e957b3e017b 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/resources/META-INF/gradle-plugins/konan.properties
+++ b/tools/kotlin-native-gradle-plugin/src/main/resources/META-INF/gradle-plugins/konan.properties
@@ -1 +1,2 @@
-implementation-class=org.jetbrains.kotlin.gradle.plugin.KonanPlugin
\ No newline at end of file
+implementation-class=org.jetbrains.kotlin.gradle.plugin.KonanPlugin
+default-konan-version=$konanVersion
\ No newline at end of file