From 71ab6e0f825ba3306c095508fc83081d85fa0355 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Thu, 31 Oct 2019 17:40:00 +0300 Subject: [PATCH] Bumped both bootstrap compiler and usual compiler versions --- Interop/Indexer/build.gradle | 4 ++-- Interop/Runtime/build.gradle | 4 ++-- Interop/StubGenerator/build.gradle | 2 +- backend.native/debugger-tests/build.gradle | 2 +- extracted/konan.serializer/build.gradle | 2 +- gradle.properties | 16 ++++++++-------- klib/build.gradle | 2 +- libclangext/build.gradle | 2 +- llvmCoverageMappingC/build.gradle | 2 +- llvmDebugInfoC/build.gradle | 2 +- shared/build.gradle | 2 +- shared/buildSrc/build.gradle | 2 +- utilities/build.gradle | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Interop/Indexer/build.gradle b/Interop/Indexer/build.gradle index 962b2c7ea45..ac4abdc9ced 100644 --- a/Interop/Indexer/build.gradle +++ b/Interop/Indexer/build.gradle @@ -20,7 +20,7 @@ buildscript { apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" dependencies { - classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion" } } @@ -118,7 +118,7 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" compile project(':Interop:Runtime') } diff --git a/Interop/Runtime/build.gradle b/Interop/Runtime/build.gradle index b1ad103f969..a5735ddd592 100644 --- a/Interop/Runtime/build.gradle +++ b/Interop/Runtime/build.gradle @@ -23,7 +23,7 @@ buildscript { apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" dependencies { - classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion" } } @@ -66,7 +66,7 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion" } diff --git a/Interop/StubGenerator/build.gradle b/Interop/StubGenerator/build.gradle index 4d3f2915ad4..a9fe65cf398 100644 --- a/Interop/StubGenerator/build.gradle +++ b/Interop/StubGenerator/build.gradle @@ -30,7 +30,7 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" compile "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion" compile project(':Interop:Indexer') compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion" diff --git a/backend.native/debugger-tests/build.gradle b/backend.native/debugger-tests/build.gradle index 2ccc5501249..750b28b4728 100644 --- a/backend.native/debugger-tests/build.gradle +++ b/backend.native/debugger-tests/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java' apply plugin: 'kotlin' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" compile project(path: ':backend.native', configuration: 'cli_bc') compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion" compile 'junit:junit:4.12' diff --git a/extracted/konan.serializer/build.gradle b/extracted/konan.serializer/build.gradle index 8826e550619..c4dec70b689 100644 --- a/extracted/konan.serializer/build.gradle +++ b/extracted/konan.serializer/build.gradle @@ -36,7 +36,7 @@ repositories { } 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-compiler:$kotlinVersion" compile "org.jetbrains.kotlin:konan.metadata:$konanVersion" diff --git a/gradle.properties b/gradle.properties index 326fdfa7f61..f2d0082ab37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,15 +15,15 @@ # # A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script. -buildKotlinVersion=1.3.60-dev-2755 -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 +buildKotlinVersion=1.3.70-dev-1070 +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 -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 -kotlinVersion=1.3.70-dev-1049 -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 -kotlinStdlibVersion=1.3.70-dev-1049 -kotlinStdlibTestsVersion=1.3.70-dev-1049 -testKotlinCompilerVersion=1.3.70-dev-1049 +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-1108 +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-1108 +kotlinStdlibTestsVersion=1.3.70-dev-1108 +testKotlinCompilerVersion=1.3.70-dev-1108 konanVersion=1.3.70 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4 diff --git a/klib/build.gradle b/klib/build.gradle index 7b5a53d2174..12434cf124d 100644 --- a/klib/build.gradle +++ b/klib/build.gradle @@ -41,7 +41,7 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" compile project(path: ':backend.native', configuration: 'cli_bc') testCompile "junit:junit:4.12" testCompile "org.jetbrains.kotlin:kotlin-test-junit:$buildKotlinVersion" diff --git a/libclangext/build.gradle b/libclangext/build.gradle index 5b720d32ea6..0dd79e3dd1e 100644 --- a/libclangext/build.gradle +++ b/libclangext/build.gradle @@ -22,7 +22,7 @@ buildscript { apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" dependencies { - classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion" } } diff --git a/llvmCoverageMappingC/build.gradle b/llvmCoverageMappingC/build.gradle index b4d7f828ac6..12128e116c9 100644 --- a/llvmCoverageMappingC/build.gradle +++ b/llvmCoverageMappingC/build.gradle @@ -23,7 +23,7 @@ buildscript { apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" dependencies { - classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion" } } diff --git a/llvmDebugInfoC/build.gradle b/llvmDebugInfoC/build.gradle index 7083f1ed7f8..76f434c6756 100644 --- a/llvmDebugInfoC/build.gradle +++ b/llvmDebugInfoC/build.gradle @@ -23,7 +23,7 @@ buildscript { apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" dependencies { - classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + classpath "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion" } } diff --git a/shared/build.gradle b/shared/build.gradle index f470bd594ec..79649ba6ab4 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -61,7 +61,7 @@ jar { } 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-util-io:$kotlinVersion" compile "org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion" diff --git a/shared/buildSrc/build.gradle b/shared/buildSrc/build.gradle index 322e6303591..68d46c297bc 100644 --- a/shared/buildSrc/build.gradle +++ b/shared/buildSrc/build.gradle @@ -33,5 +33,5 @@ repositories { dependencies { compile gradleApi() compile localGroovy() - compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" } \ No newline at end of file diff --git a/utilities/build.gradle b/utilities/build.gradle index 327a98de986..85090aa18c1 100644 --- a/utilities/build.gradle +++ b/utilities/build.gradle @@ -15,7 +15,7 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" compile project(':backend.native') compile project(':Interop:StubGenerator') compile project(':klib')