From 6ad7f6f08d655fc6bd3f805a0c5dc9d1204fe0f4 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 2 Jun 2020 05:26:56 +0300 Subject: [PATCH] Advance buildKotlinVersion to 1.4.0-dev-9619 Use it to build shared tools. Earlier, kotlinVersion was used, which caused shared and main project being built with different versions of the compiler. (cherry picked from commit d4ffca9800b40256cf9d505911ca8c8f7acadc4d) --- shared/settings.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/settings.gradle.kts b/shared/settings.gradle.kts index b3698a0c487..2a10653da54 100644 --- a/shared/settings.gradle.kts +++ b/shared/settings.gradle.kts @@ -3,18 +3,18 @@ pluginManagement { rootDir.resolve("../gradle.properties").reader().use(::load) } - val kotlinCompilerRepo: String by rootProperties - val kotlinVersion: String by rootProperties + val buildKotlinCompilerRepo: String by rootProperties + val buildKotlinVersion: String by rootProperties repositories { - maven(kotlinCompilerRepo) + maven(buildKotlinCompilerRepo) maven("https://cache-redirector.jetbrains.com/maven-central") } resolutionStrategy { eachPlugin { if (requested.id.id == "kotlin") { - useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:$buildKotlinVersion") } } }