[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
JetBrains · Sep 10, 2018 · 7f00e58 · 7f00e58
1 parent 0d8e176
commit 7f00e58
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'