From ca47247e5d69b950cc6f3601b03d5ec03d8be68d Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Wed, 23 Jan 2019 15:35:09 +0300
Subject: [PATCH] Build: got rid of useBootstrapStdlib flag (replaced with
 jpsBuild flag)

---
 buildSrc/src/main/kotlin/dependencies.kt |  4 +---
 gradle.properties                        |  1 -
 gradle.properties.as32                   |  5 +----
 gradle.properties.as33                   |  5 +----
 gradle.properties.as34                   |  5 +----
 gradle.properties.cidr183                |  5 +----
 settings.gradle                          | 13 +++----------
 7 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index 7e7b6054822..2598a2b7a2f 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -58,9 +58,7 @@ fun Project.ideaUltimatePreloadedDeps(vararg artifactBaseNames: String, subdir:
 fun Project.kotlinDep(artifactBaseName: String, version: String): String = "org.jetbrains.kotlin:kotlin-$artifactBaseName:$version"
 
 val Project.useBootstrapStdlib: Boolean get() =
-    findProperty("useBootstrapStdlib")?.let { it.toString() != "false" }
-        ?: findProperty("jpsBuild")?.let { it.toString() == "true" }
-        ?: false
+    findProperty("jpsBuild")?.toString() == "true"
 
 fun Project.kotlinStdlib(suffix: String? = null): Any {
     return if (useBootstrapStdlib)
diff --git a/gradle.properties b/gradle.properties
index 55d05f66de6..422d4182f8a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,5 +9,4 @@ kotlin.compiler.newInferenceEnabled=true
 #bootstrap.kotlin.version=1.1.50-dev-1451
 #signingRequired=true
 
-#useBootstrapStdlib=true
 #jpsBuild=true
diff --git a/gradle.properties.as32 b/gradle.properties.as32
index 410e1b13e3d..d5407a7a888 100644
--- a/gradle.properties.as32
+++ b/gradle.properties.as32
@@ -10,7 +10,4 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 intellijUltimateEnabled=false
-intellijEnforceCommunitySdk=true
-
-#useBootstrapStdlib=true
-#jpsBuild=true
+intellijEnforceCommunitySdk=true
\ No newline at end of file
diff --git a/gradle.properties.as33 b/gradle.properties.as33
index b6fd27e60e0..d5407a7a888 100644
--- a/gradle.properties.as33
+++ b/gradle.properties.as33
@@ -10,7 +10,4 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 intellijUltimateEnabled=false
-intellijEnforceCommunitySdk=true
-
-#useBootstrapStdlib=true
-#jpsBuild=true
\ No newline at end of file
+intellijEnforceCommunitySdk=true
\ No newline at end of file
diff --git a/gradle.properties.as34 b/gradle.properties.as34
index b6fd27e60e0..d5407a7a888 100644
--- a/gradle.properties.as34
+++ b/gradle.properties.as34
@@ -10,7 +10,4 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 intellijUltimateEnabled=false
-intellijEnforceCommunitySdk=true
-
-#useBootstrapStdlib=true
-#jpsBuild=true
\ No newline at end of file
+intellijEnforceCommunitySdk=true
\ No newline at end of file
diff --git a/gradle.properties.cidr183 b/gradle.properties.cidr183
index 86ce473c700..84668cd47ba 100644
--- a/gradle.properties.cidr183
+++ b/gradle.properties.cidr183
@@ -9,7 +9,4 @@ kotlin.compiler.newInferenceEnabled=true
 #bootstrap.kotlin.version=1.1.50-dev-1451
 #signingRequired=true
 
-cidrPluginsEnabled=true
-
-#useBootstrapStdlib=true
-#jpsBuild=true
\ No newline at end of file
+cidrPluginsEnabled=true
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 8ddebb540e0..32e04e7bca4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -218,19 +218,14 @@ if (isTeamcityBuild || includeUltimate) {
 }
 
 def isJpsBuild = hasProperty("jpsBuild") && jpsBuild == 'true'
-def includeStdlib = !hasProperty("useBootstrapStdlib") || useBootstrapStdlib == 'false'
 if (isJpsBuild) {
-    includeStdlib = false
-
     include ":kotlin-stdlib:jps-build"
     project(":kotlin-stdlib:jps-build").projectDir = "$rootDir/libraries/stdlib/jps-build" as File
 } else {
     // modules that we are currently cannot compile with jps
     include ":kotlin-idl2k"
     project(':kotlin-idl2k').projectDir = file("$rootDir/libraries/tools/idl2k")
-}
-
-if (includeStdlib) {
+    
     include ":kotlin-stdlib-common",
             ":kotlin-stdlib",
             ":kotlin-stdlib-js",
@@ -246,11 +241,7 @@ if (includeStdlib) {
             ":kotlin-runtime",
 
             ":include:kotlin-stdlib-common-sources"
-}
 
-rootProject.name = "kotlin"
-
-if (includeStdlib) {
     project(':kotlin-stdlib-common').projectDir = "$rootDir/libraries/stdlib/common" as File
     project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib/jvm" as File
     project(':kotlin-stdlib-js').projectDir = "$rootDir/libraries/stdlib/js" as File
@@ -268,6 +259,8 @@ if (includeStdlib) {
     project(':kotlin-runtime').projectDir = "$rootDir/libraries/stdlib/runtime" as File
 }
 
+rootProject.name = "kotlin"
+
 project(':kotlin-script-runtime').projectDir = "$rootDir/libraries/tools/script-runtime" as File
 project(':kotlin-test').projectDir = "$rootDir/libraries/kotlin.test" as File
 project(':kotlin-test:kotlin-test-common').projectDir = "$rootDir/libraries/kotlin.test/common" as File