Bumped both bootstrap compiler and usual compiler versions
This commit is contained in:
@@ -20,7 +20,7 @@ buildscript {
|
|||||||
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -118,7 +118,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
compile project(':Interop:Runtime')
|
compile project(':Interop:Runtime')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ buildscript {
|
|||||||
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -66,7 +66,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
compile "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
|
||||||
compile project(':Interop:Indexer')
|
compile project(':Interop:Indexer')
|
||||||
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ apply plugin: 'java'
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
compile project(path: ':backend.native', configuration: 'cli_bc')
|
compile project(path: ':backend.native', configuration: 'cli_bc')
|
||||||
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||||
compile 'junit:junit:4.12'
|
compile 'junit:junit:4.12'
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||||
compile "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
|
||||||
compile "org.jetbrains.kotlin:konan.metadata:$konanVersion"
|
compile "org.jetbrains.kotlin:konan.metadata:$konanVersion"
|
||||||
|
|||||||
+8
-8
@@ -15,15 +15,15 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script.
|
# A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script.
|
||||||
buildKotlinVersion=1.3.60-dev-2755
|
buildKotlinVersion=1.3.70-dev-1070
|
||||||
buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-2755,branch:default:any,pinned:true/artifacts/content/maven
|
buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-1070,branch:default:any,pinned:true/artifacts/content/maven
|
||||||
remoteRoot=konan_tests
|
remoteRoot=konan_tests
|
||||||
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-1049,branch:default:any,pinned:true/artifacts/content/maven
|
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-1108,branch:default:any,pinned:true/artifacts/content/maven
|
||||||
kotlinVersion=1.3.70-dev-1049
|
kotlinVersion=1.3.70-dev-1108
|
||||||
kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-1049,branch:default:any,pinned:true/artifacts/content/maven
|
kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.3.70-dev-1108,branch:default:any,pinned:true/artifacts/content/maven
|
||||||
kotlinStdlibVersion=1.3.70-dev-1049
|
kotlinStdlibVersion=1.3.70-dev-1108
|
||||||
kotlinStdlibTestsVersion=1.3.70-dev-1049
|
kotlinStdlibTestsVersion=1.3.70-dev-1108
|
||||||
testKotlinCompilerVersion=1.3.70-dev-1049
|
testKotlinCompilerVersion=1.3.70-dev-1108
|
||||||
konanVersion=1.3.70
|
konanVersion=1.3.70
|
||||||
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
|
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
|
||||||
org.gradle.workers.max=4
|
org.gradle.workers.max=4
|
||||||
|
|||||||
+1
-1
@@ -41,7 +41,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
compile project(path: ':backend.native', configuration: 'cli_bc')
|
compile project(path: ':backend.native', configuration: 'cli_bc')
|
||||||
testCompile "junit:junit:4.12"
|
testCompile "junit:junit:4.12"
|
||||||
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$buildKotlinVersion"
|
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$buildKotlinVersion"
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ buildscript {
|
|||||||
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ buildscript {
|
|||||||
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ buildscript {
|
|||||||
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ jar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
compile "org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion"
|
||||||
compile "org.jetbrains.kotlin:kotlin-util-io:$kotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-util-io:$kotlinVersion"
|
||||||
compile "org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion"
|
||||||
|
|||||||
@@ -33,5 +33,5 @@ repositories {
|
|||||||
dependencies {
|
dependencies {
|
||||||
compile gradleApi()
|
compile gradleApi()
|
||||||
compile localGroovy()
|
compile localGroovy()
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
}
|
}
|
||||||
@@ -15,7 +15,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
|
||||||
compile project(':backend.native')
|
compile project(':backend.native')
|
||||||
compile project(':Interop:StubGenerator')
|
compile project(':Interop:StubGenerator')
|
||||||
compile project(':klib')
|
compile project(':klib')
|
||||||
|
|||||||
Reference in New Issue
Block a user