From 7f00e581b5042f2228261943cdb0e5d142fc274d Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilmat192@gmail.com>
Date: Mon, 10 Sep 2018 16:42:19 +0700
Subject: [PATCH] [gradle-plugin] Depend on Kotlin 0.9.0-native (#1993)

* [gradle-plugin] Depend on Kotlin 0.9.0-native

* [gradle-plugin] Use test artifacts from eap repo
---
 samples/androidNativeActivity/build.gradle     | 3 ---
 samples/build.gradle                           | 3 ---
 samples/calculator/ios/build.gradle            | 1 -
 samples/curl/build.gradle                      | 3 ---
 samples/tensorflow/build.gradle                | 3 ---
 samples/torch/build.gradle                     | 3 ---
 tools/kotlin-native-gradle-plugin/build.gradle | 9 +++++----
 7 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/samples/androidNativeActivity/build.gradle b/samples/androidNativeActivity/build.gradle
index e60c6e2f2fc..af7bde516eb 100644
--- a/samples/androidNativeActivity/build.gradle
+++ b/samples/androidNativeActivity/build.gradle
@@ -6,9 +6,6 @@ buildscript {
         maven {
             url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
         }
-        maven {
-	        url "http://dl.bintray.com/kotlin/kotlin-eap"
-	    }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:${project.property('konan.plugin.version')}"
diff --git a/samples/build.gradle b/samples/build.gradle
index 1fc2a1d22de..75330ee4a8a 100644
--- a/samples/build.gradle
+++ b/samples/build.gradle
@@ -7,9 +7,6 @@ subprojects {
             maven {
                 url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
             }
-	        maven {
-	            url "http://dl.bintray.com/kotlin/kotlin-eap"
-	        }
         }
 
         dependencies {
diff --git a/samples/calculator/ios/build.gradle b/samples/calculator/ios/build.gradle
index 0c6c06d9178..c2b151aa897 100644
--- a/samples/calculator/ios/build.gradle
+++ b/samples/calculator/ios/build.gradle
@@ -2,7 +2,6 @@ buildscript {
     repositories {
         mavenCentral()
         maven { url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" }
-        maven { url "http://dl.bintray.com/kotlin/kotlin-eap" }
     }
 
     dependencies {
diff --git a/samples/curl/build.gradle b/samples/curl/build.gradle
index 1a052cbcad4..27f5b43a3aa 100644
--- a/samples/curl/build.gradle
+++ b/samples/curl/build.gradle
@@ -6,9 +6,6 @@ buildscript {
         maven {
             url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
         }
-        maven {
-	        url "http://dl.bintray.com/kotlin/kotlin-eap"
-	    }
     }
 
     dependencies {
diff --git a/samples/tensorflow/build.gradle b/samples/tensorflow/build.gradle
index 047638e7c32..a5049af80e9 100644
--- a/samples/tensorflow/build.gradle
+++ b/samples/tensorflow/build.gradle
@@ -6,9 +6,6 @@ buildscript {
         maven {
             url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
         }
-        maven {
-	        url "http://dl.bintray.com/kotlin/kotlin-eap"
-	    }
     }
 
     dependencies {
diff --git a/samples/torch/build.gradle b/samples/torch/build.gradle
index 1ad5a9779e1..222dfc174a0 100644
--- a/samples/torch/build.gradle
+++ b/samples/torch/build.gradle
@@ -6,9 +6,6 @@ buildscript {
         maven {
             url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
         }
-        maven {
-	        url "http://dl.bintray.com/kotlin/kotlin-eap"
-	    }
     }
 
     dependencies {
diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle
index 66b1ebef670..d52e5fd9a84 100644
--- a/tools/kotlin-native-gradle-plugin/build.gradle
+++ b/tools/kotlin-native-gradle-plugin/build.gradle
@@ -31,6 +31,7 @@ buildscript {
         maven {
             url = 'https://cache-redirector.jetbrains.com/jcenter'
         }
+        mavenCentral()
     }
 
     dependencies {
@@ -72,14 +73,14 @@ configurations {
 }
 
 dependencies {
-    shadow "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
-    shadow "org.jetbrains.kotlin:kotlin-gradle-plugin:$buildKotlinVersion"
+    shadow "org.jetbrains.kotlin:kotlin-stdlib:0.9.0-native"
+    shadow "org.jetbrains.kotlin:kotlin-gradle-plugin:0.9.0-native"
 
     bundleDependencies "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
 
     testImplementation 'junit:junit:4.12'
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$buildKotlinVersion"
-    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$buildKotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.3-M2"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.3-M2"
     testImplementation "org.tools4j:tools4j-spockito:1.6"
     testImplementation('org.spockframework:spock-core:1.1-groovy-2.4') {
         exclude module: 'groovy-all'