From b7d21ab4da1ad9d16e627b971438aa24880e1b3b Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 2 Oct 2017 06:54:34 +0300
Subject: [PATCH] Use embeddedKotlinVersion to compile buildSrc, but make it
 possible to override it

---
 buildSrc/build.gradle.kts  | 17 ++++++++++-------
 buildSrc/gradle.properties |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 653e81fc6ee..286e35daf85 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,21 +1,24 @@
 
 buildscript {
-    // TODO: find a way to reuse bootstrap.kotlin.* props from the main project
-//    java.util.Properties().also { it.load(java.io.FileInputStream("gradle.properties")) }
-    extra["bootstrap_kotlin_version"] = System.getProperty("bootstrap.kotlin.version") ?: embeddedKotlinVersion
+    val buildSrcKotlinVersion: String by extra(findProperty("buildSrc.kotlin.version")?.toString() ?: embeddedKotlinVersion)
+    extra["buildSrcKotlinRepo"] = findProperty("buildSrc.kotlin.repo")
 
     repositories {
-        System.getProperty("bootstrap.kotlin.repo")?.let {
+        extra["buildSrcKotlinRepo"]?.let {
             maven { setUrl(it) }
         }
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["bootstrap_kotlin_version"]}")
-        classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${rootProject.extra["bootstrap_kotlin_version"]}")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$buildSrcKotlinVersion")
+        classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:$buildSrcKotlinVersion")
     }
 }
 
+logger.info("buildSrcKotlinVersion: " + extra["buildSrcKotlinVersion"])
+logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
+logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)
+
 apply {
     plugin("kotlin")
     plugin("kotlin-sam-with-receiver")
@@ -26,7 +29,7 @@ plugins {
 }
 
 repositories {
-    System.getProperty("bootstrap.kotlin.repo")?.let {
+    extra["buildSrcKotlinRepo"]?.let {
         maven { setUrl(it) }
     }
 //    maven { setUrl("https://repo.gradle.org/gradle/libs-releases-local") }
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 8e9c5b802be..7557cdd54f6 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -3,5 +3,5 @@ org.gradle.parallel=false
 org.gradle.configureondemand=false
 org.gradle.jvmargs=-Xmx1200m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled
 
-systemProp.bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev
-systemProp.bootstrap.kotlin.version=1.1.5-dev-640
+#buildSrc.kotlin.repo=https://jcenter.bintray.com
+#buildSrc.kotlin.version=1.1.50