From d894d6af8cdb5c60705aef7878e31cec4876f265 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Fri, 23 Mar 2018 13:57:02 +0300
Subject: [PATCH] [samples] Explicitly specify gradle plugin version

---
 build.gradle              | 10 +++++++++-
 samples/build.gradle      |  2 +-
 samples/gradle.properties |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index a643bc310d9..235664bcd72 100644
--- a/build.gradle
+++ b/build.gradle
@@ -373,7 +373,15 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
         include 'gradle.properties'
         include 'androidNativeActivity/gradle.properties'
         into "$baseName/samples"
-        filter { it.startsWith("konan.home=") ? "konan.home=../.." : it }
+        filter {
+            if (it.startsWith("konan.home=")) {
+                return "konan.home=../.."
+            }
+            if (it.startsWith("konan.plugin.version=")) {
+                return "konan.plugin.version=$konanVersion"
+            }
+            return it
+        }
     }
 
     destinationDir = file('.')
diff --git a/samples/build.gradle b/samples/build.gradle
index 4b235010de8..0708a8f1c99 100644
--- a/samples/build.gradle
+++ b/samples/build.gradle
@@ -8,7 +8,7 @@ subprojects {
         }
 
         dependencies {
-            classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:+"
+            classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:${project.property('konan.plugin.version')}"
         }
     }
 }
diff --git a/samples/gradle.properties b/samples/gradle.properties
index 3be37412632..cdb70994cf8 100644
--- a/samples/gradle.properties
+++ b/samples/gradle.properties
@@ -1 +1,2 @@
-konan.home=../../dist
\ No newline at end of file
+konan.home=../../dist
+konan.plugin.version=+
\ No newline at end of file