build: use Kotlin 1.1-M02 to build all Kotlin JVM sources

This commit is contained in:
Svyatoslav Scherbina
2016-11-16 13:53:28 +07:00
parent 8a66de216d
commit 3095044420
7 changed files with 33 additions and 28 deletions
+6 -7
View File
@@ -1,7 +1,10 @@
buildscript {
repositories {
mavenCentral()
}
repositories {
mavenCentral()
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap-1.1"
}
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -43,10 +46,6 @@ sourceSets {
}
}
repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile project(':Interop:Runtime')
+6 -7
View File
@@ -1,7 +1,10 @@
buildscript {
repositories {
mavenCentral()
}
repositories {
mavenCentral()
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap-1.1"
}
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -32,10 +35,6 @@ model {
}
repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
+6 -7
View File
@@ -1,7 +1,10 @@
buildscript {
repositories {
mavenCentral()
}
repositories {
mavenCentral()
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap-1.1"
}
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -13,10 +16,6 @@ apply plugin: 'application'
mainClassName = "org.jetbrains.kotlin.native.interop.gen.jvm.MainKt"
repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile project(':Interop:Indexer')
+4 -5
View File
@@ -1,6 +1,9 @@
buildscript {
repositories {
mavenCentral()
mavenCentral()
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap-1.1"
}
}
dependencies {
@@ -12,10 +15,6 @@ apply plugin: 'kotlin'
apply plugin: org.jetbrains.kotlin.NativeInteropPlugin
apply plugin: 'application'
repositories {
mavenCentral()
}
kotlinNativeInterop {
llvm {
defFile '../backend.native/llvm.def'
+3 -1
View File
@@ -1,6 +1,9 @@
buildscript {
repositories {
mavenCentral()
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap-1.1"
}
}
dependencies {
@@ -21,7 +24,6 @@ String kotlinCompilerModule = 'org.jetbrains.kotlin:kotlin-compiler:1.1-20161121
// (gets applied to this project and all its subprojects)
allprojects {
repositories {
mavenCentral()
maven {
url 'http://oss.sonatype.org/content/repositories/snapshots'
}
+7
View File
@@ -13,6 +13,13 @@ allprojects {
evaluationDependsOn(":dependencies")
}
repositories {
mavenCentral()
maven {
url "http://dl.bintray.com/kotlin/kotlin-eap-1.1"
}
}
ext.clangPath = ["$llvmDir/bin"]
ext.clangArgs = []
final String binDir
+1 -1
View File
@@ -1 +1 @@
kotlin_version=1.0.4
kotlin_version=1.1-M02