[samples] Explicitly specify gradle plugin version

JetBrains · Mar 23, 2018 · 1e6be90 · 1e6be90
1 parent 21be7bb
commit 1e6be90
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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
@@ -1 +1,2 @@
-konan.home=../../dist
+konan.home=../../dist
+konan.plugin.version=+
-Original file line number
+Diff line change
@@ Expand Up / @@ -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')}"
             }
         }
     }
@@ Expand Down @@