From 5483de276e3698ca9a1c8f9f16070eb4d5eb97e8 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 2 Oct 2017 07:15:39 +0300
Subject: [PATCH] Specify bootstrap version with gradle props instead of system
 props

Make bootstrap dependency version explicit
---
 build.gradle.kts                         | 6 +++---
 buildSrc/src/main/kotlin/dependencies.kt | 9 ++-------
 gradle.properties                        | 4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 592dc6498cd..9eae88ae5bb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 
 buildscript {
     val repos = listOfNotNull(
-            System.getProperty("bootstrap.kotlin.repo"),
+            property("bootstrap.kotlin.repo") as String,
             "https://repo.gradle.org/gradle/repo",
             "https://plugins.gradle.org/m2",
             "http://repository.jetbrains.com/utils/")
@@ -26,7 +26,7 @@ buildscript {
 
     dependencies {
         classpath("com.gradle.publish:plugin-publish-plugin:0.9.7")
-        classpath(kotlinDep("gradle-plugin"))
+        classpath(kotlinDep("gradle-plugin", bootstrapKotlinVersion))
     }
 }
 
@@ -70,7 +70,7 @@ repositories {
 }
 
 dependencies {
-    bootstrapCompileCfg(kotlinDep("compiler-embeddable"))
+    bootstrapCompileCfg(kotlinDep("compiler-embeddable", bootstrapKotlinVersion))
 }
 
 val commonBuildDir = File(rootDir, "build")
diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index 1814bba6fd4..64c0bf2bdf1 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -7,15 +7,10 @@ import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.kotlin.dsl.*
-import org.gradle.plugin.use.PluginDependenciesSpec
-import org.gradle.plugin.use.PluginDependencySpec
 import java.io.File
 import java.util.*
 
-val bootstrapKotlinVersion: String = System.getProperty("bootstrap.kotlin.version") ?: embeddedKotlinVersion
-
-fun PluginDependenciesSpec.kotlin(module: String, version: String? = null): PluginDependencySpec =
-        id("org.jetbrains.kotlin.$module") version (version ?: bootstrapKotlinVersion)
+val Project.bootstrapKotlinVersion: String get() = this.property("bootstrap.kotlin.version") as String
 
 fun Project.commonDep(coord: String): String {
     val parts = coord.split(':')
@@ -63,7 +58,7 @@ fun Project.ideaPluginDeps(vararg artifactBaseNames: String, plugin: String, sub
 fun Project.ideaUltimatePluginDeps(vararg artifactBaseNames: String, plugin: String, subdir: String = "lib"): ConfigurableFileCollection =
         ideaUltimateSdkDeps(*artifactBaseNames, subdir = "plugins/$plugin/$subdir")
 
-fun Project.kotlinDep(artifactBaseName: String, version: String? = null): String = "org.jetbrains.kotlin:kotlin-$artifactBaseName:${version ?: bootstrapKotlinVersion}"
+fun Project.kotlinDep(artifactBaseName: String, version: String): String = "org.jetbrains.kotlin:kotlin-$artifactBaseName:$version"
 
 fun DependencyHandler.projectDist(name: String): Dependency = project(name, configuration = "distJar").apply { isTransitive = false }
 fun DependencyHandler.projectTests(name: String): Dependency = project(name, configuration = "tests-jar").apply { isTransitive = false }
diff --git a/gradle.properties b/gradle.properties
index 2f267af608c..fb97f0a9c87 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,6 @@ org.gradle.parallel=false
 org.gradle.configureondemand=false
 org.gradle.jvmargs=-Xmx1000m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled
 
-systemProp.bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev
-systemProp.bootstrap.kotlin.version=1.1.50-dev-1451
+bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev
+bootstrap.kotlin.version=1.1.50-dev-1451
 #signingRequired=true