From b8efe3afb18c2a83ae8992fbc58e204c92f5edaa Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Thu, 13 Jun 2019 16:47:33 +0300 Subject: [PATCH] [kotlin compiler] use the last version of plugin `kotlinVersion` with embedded compiler of `buildKotlinVersion` the buildKotlinVersion down to 1.3.50-dev-787 --- gradle.properties | 4 ++-- gradle/kotlinGradlePlugin.gradle | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index cb86e47f4c4..397e3392344 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,8 +15,8 @@ # # A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script. -buildKotlinVersion=1.3.50-dev-1010 -buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-1010,branch:default:any,pinned:true/artifacts/content/maven +buildKotlinVersion=1.3.50-dev-787 +buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-787,branch:default:any,pinned:true/artifacts/content/maven remoteRoot=konan_tests kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-1050,branch:default:any,pinned:true/artifacts/content/maven kotlinVersion=1.3.50-dev-1050 diff --git a/gradle/kotlinGradlePlugin.gradle b/gradle/kotlinGradlePlugin.gradle index 99532e09320..0cb74d7d1e7 100644 --- a/gradle/kotlinGradlePlugin.gradle +++ b/gradle/kotlinGradlePlugin.gradle @@ -20,5 +20,17 @@ project.buildscript.repositories { } project.buildscript.dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$buildKotlinVersion" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } +configurations { + kotlinCompilerClasspath +} +project.repositories { + maven { + url kotlinCompilerRepo + } +} + +project.dependencies { + kotlinCompilerClasspath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$buildKotlinVersion") +} \ No newline at end of file