[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
This commit is contained in:
Ilya Matveev
2018-09-10 16:42:19 +07:00
committed by GitHub
parent 0d8e176050
commit 7f00e581b5
7 changed files with 5 additions and 20 deletions
@@ -6,9 +6,6 @@ buildscript {
maven { maven {
url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
} }
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap"
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:${project.property('konan.plugin.version')}" classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:${project.property('konan.plugin.version')}"
-3
View File
@@ -7,9 +7,6 @@ subprojects {
maven { maven {
url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
} }
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap"
}
} }
dependencies { dependencies {
-1
View File
@@ -2,7 +2,6 @@ buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
maven { url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" } maven { url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" }
maven { url "http://dl.bintray.com/kotlin/kotlin-eap" }
} }
dependencies { dependencies {
-3
View File
@@ -6,9 +6,6 @@ buildscript {
maven { maven {
url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
} }
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap"
}
} }
dependencies { dependencies {
-3
View File
@@ -6,9 +6,6 @@ buildscript {
maven { maven {
url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
} }
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap"
}
} }
dependencies { dependencies {
-3
View File
@@ -6,9 +6,6 @@ buildscript {
maven { maven {
url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
} }
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap"
}
} }
dependencies { dependencies {
@@ -31,6 +31,7 @@ buildscript {
maven { maven {
url = 'https://cache-redirector.jetbrains.com/jcenter' url = 'https://cache-redirector.jetbrains.com/jcenter'
} }
mavenCentral()
} }
dependencies { dependencies {
@@ -72,14 +73,14 @@ configurations {
} }
dependencies { dependencies {
shadow "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" shadow "org.jetbrains.kotlin:kotlin-stdlib:0.9.0-native"
shadow "org.jetbrains.kotlin:kotlin-gradle-plugin:$buildKotlinVersion" shadow "org.jetbrains.kotlin:kotlin-gradle-plugin:0.9.0-native"
bundleDependencies "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion" bundleDependencies "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation "org.jetbrains.kotlin:kotlin-test:$buildKotlinVersion" testImplementation "org.jetbrains.kotlin:kotlin-test:1.3-M2"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$buildKotlinVersion" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.3-M2"
testImplementation "org.tools4j:tools4j-spockito:1.6" testImplementation "org.tools4j:tools4j-spockito:1.6"
testImplementation('org.spockframework:spock-core:1.1-groovy-2.4') { testImplementation('org.spockframework:spock-core:1.1-groovy-2.4') {
exclude module: 'groovy-all' exclude module: 'groovy-all'