Build: implement useBootstrapStdlib flag

Excludes stdlib projects from build and uses bootstrap stdlib artifacts

 #KT-29205

ant/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 dependencies {
     compile(commonDep("org.apache.ant", "ant"))
     compile(project(":kotlin-preloader"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
 }
 
 sourceSets {

build-common/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
     testCompile(protobufFull())
-    testCompile(project(":kotlin-stdlib"))
+    testCompile(kotlinStdlib())
     testCompileOnly(intellijDep()) { includeJars("openapi") }
 
     testRuntime(project(":kotlin-reflect"))

buildSrc/src/main/kotlin/dependencies.kt

@@ -57,6 +57,15 @@ 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" } ?: false
+
+fun Project.kotlinStdlib(suffix: String? = null): Any {
+    return if (useBootstrapStdlib)
+        kotlinDep(listOfNotNull("stdlib", suffix).joinToString("-"), bootstrapKotlinVersion)
+    else
+        dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-"))
+}
+
 @Deprecated("Depend on the default configuration instead", ReplaceWith("project(name)"))
 fun DependencyHandler.projectDist(name: String): ProjectDependency = project(name)
 fun DependencyHandler.projectTests(name: String): ProjectDependency = project(name, configuration = "tests-jar")

compiler/android-tests/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     compile(project(":compiler:cli"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:backend"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
     compile(project(":kotlin-reflect"))
     compile(projectTests(":compiler:tests-common"))

compiler/build.gradle.kts

@@ -37,19 +37,16 @@ fun configureFreeCompilerArg(isEnabled: Boolean, compilerArgument: String) {
     }
 }
 
-val depDistProjects = listOf(
-        ":kotlin-script-runtime",
-        ":kotlin-stdlib",
-        ":kotlin-test:kotlin-test-jvm"
-)
 val antLauncherJar by configurations.creating
 
 dependencies {
     testRuntime(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests
 
-    depDistProjects.forEach {
+    testCompile(project(":kotlin-script-runtime"))
-        testCompile(project(it))
+    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    }
+    
+    testCompile(kotlinStdlib())
+
     testCompile(commonDep("junit:junit"))
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))

compiler/cli/cli-runner/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
 }
 

compiler/container/build.gradle.kts

@@ -8,10 +8,10 @@ jvmTarget = "1.6"
 dependencies {
     compile(project(":core:util.runtime"))
     compile(commonDep("javax.inject"))
-    compileOnly(project(":kotlin-stdlib"))
+    compileOnly(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testCompile(project(":kotlin-stdlib"))
+    testCompile(kotlinStdlib())
     testCompileOnly("org.jetbrains:annotations:13.0")
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))

compiler/daemon/daemon-common/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(project(":js:js.frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }

compiler/frontend.script/build.gradle.kts

@@ -9,7 +9,7 @@ jvmTarget = "1.6"
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(project(":kotlin-reflect-api"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }

compiler/incremental-compilation-impl/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
 
     testCompile(commonDep("junit:junit"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
-    testCompile(project(":kotlin-stdlib"))
+    testCompile(kotlinStdlib())
     testCompileOnly("org.jetbrains:annotations:13.0")
     testCompile(projectTests(":kotlin-build-common"))
     testCompile(projectTests(":compiler:tests-common"))

compiler/tests-common-jvm6/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
 }

compiler/util/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
     compile(project(":core:deserialization"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }

core/descriptors/build.gradle.kts

@@ -8,7 +8,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(project(":core:util.runtime"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
     compile(project(":kotlin-annotations-jvm"))
 }

core/metadata/build.gradle.kts

@@ -10,7 +10,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(protobufLite())
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
 }
 

core/util.runtime/build.gradle.kts

@@ -9,7 +9,7 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
-    compileOnly(project(":kotlin-stdlib"))
+    compileOnly(kotlinStdlib())
     compileOnly("org.jetbrains:annotations:13.0")
 }
 

eval4j/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":compiler:backend"))
     compile(files(toolsJar()))
     compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }

generators/test-generator/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     compile(intellijDep()) { includeJars("util") }
     testCompile(project(":core:util.runtime"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":kotlin-stdlib"))
+    testCompile(kotlinStdlib())
     testCompile(commonDep("junit:junit"))
 }
 

gradle.properties

@@ -8,3 +8,5 @@ kotlin.compiler.newInferenceEnabled=true
 #bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev
 #bootstrap.kotlin.version=1.1.50-dev-1451
 #signingRequired=true
+
+#useBootstrapStdlib=true

gradle.properties.as32

@@ -10,4 +10,6 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 intellijUltimateEnabled=false
-intellijEnforceCommunitySdk=true
+intellijEnforceCommunitySdk=true
+
+#useBootstrapStdlib=true

gradle.properties.as33

@@ -10,4 +10,6 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 intellijUltimateEnabled=false
-intellijEnforceCommunitySdk=true
+intellijEnforceCommunitySdk=true
+
+#useBootstrapStdlib=true

gradle.properties.as34

@@ -10,4 +10,6 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 intellijUltimateEnabled=false
-intellijEnforceCommunitySdk=true
+intellijEnforceCommunitySdk=true
+
+#useBootstrapStdlib=true

gradle.properties.cidr183

@@ -10,3 +10,5 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 cidrPluginsEnabled=true
+
+#useBootstrapStdlib=true

idea/build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 dependencies {
     testRuntime(intellijDep())
 
-    compile(project(":kotlin-stdlib-jdk8"))
+    compile(kotlinStdlib("jdk8"))
     compileOnly(project(":kotlin-reflect-api"))
     compile(project(":core:descriptors"))
     compile(project(":core:descriptors.jvm"))

idea/fir-view/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     val compileOnly by configurations
 
 
-    compile(projectDist(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compile(project(":core:descriptors"))
     compile(project(":compiler:fir:tree"))

idea/idea-core/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compile(project(":core:descriptors"))
     compile(project(":core:descriptors.jvm"))

idea/idea-jps-common/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))

idea/kotlin-gradle-tooling/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":compiler:cli-common"))
     compile(intellijPluginDep("gradle"))
     compileOnly(intellijDep()) { includeJars("slf4j-api-1.7.25") }

idea/kotlin-gradle-tooling/build.gradle.kts.181

@@ -9,7 +9,7 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":compiler:cli-common"))
     compile(intellijPluginDep("gradle"))
     compileOnly(intellijDep()) { includeJars("slf4j-api-1.7.10") }

idea/kotlin-gradle-tooling/build.gradle.kts.as32

@@ -9,7 +9,7 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":compiler:cli-common"))
     compile(intellijPluginDep("gradle"))
     compileOnly(intellijDep()) { includeJars("slf4j-api-1.7.10") }

j2k/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 dependencies {
     testRuntime(intellijDep())
 
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:light-classes"))

js/js.tests/build.gradle.kts

@@ -33,8 +33,8 @@ dependencies {
     testCompile(projectTests(":kotlin-build-common"))
     testCompile(projectTests(":generators:test-generator"))
 
-    testRuntime(project(":kotlin-stdlib"))
+    testRuntime(kotlinStdlib())
-    testJsRuntime(project(":kotlin-stdlib-js"))
+    testJsRuntime(kotlinStdlib("js"))
     testJsRuntime(project(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
     testRuntime(project(":kotlin-reflect"))
     testRuntime(project(":kotlin-preloader")) // it's required for ant tests

konan/utils/build.gradle.kts

@@ -8,7 +8,7 @@ description = "Kotlin/Native utils"
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
 }
 
 sourceSets {

libraries/commonConfiguration.gradle

@@ -215,3 +215,9 @@ ext.configurePublishing = { Project project ->
     }
 
 }
+
+allprojects { project ->
+    dependencies.ext.kotlinStdlib = { suffix ->
+        DependenciesKt.kotlinStdlib(project, suffix)
+    }
+}

libraries/examples/annotation-processor-example/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
 }
 
 sourceSets {

libraries/examples/kotlin-gradle-subplugin-example/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 
     compile project(':kotlin-test::kotlin-test-junit')
 
-    compileOnly project(":kotlin-stdlib")
+    compileOnly kotlinStdlib()
     compileOnly project(':compiler')
     compileOnly project(':compiler:plugin-api')
     compileOnly project(':compiler:cli-common')

libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 val compilerClasspath by configurations.creating
 
 dependencies {
-    testCompile(project(":kotlin-stdlib"))
+    testCompile(kotlinStdlib())
     testCompile(project(":kotlin-script-runtime"))
     testCompile(project(":kotlin-script-util"))
     testCompile(projectRuntimeJar(":kotlin-daemon-client"))
@@ -18,7 +18,7 @@ dependencies {
     testRuntime(project(":kotlin-reflect"))
     compilerClasspath(projectRuntimeJar(":kotlin-compiler-embeddable"))
     compilerClasspath(project(":kotlin-reflect"))
-    compilerClasspath(project(":kotlin-stdlib"))
+    compilerClasspath(kotlinStdlib())
     compilerClasspath(project(":kotlin-script-runtime"))
     compilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
     compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)

libraries/examples/kotlin-jsr223-local-example/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
     compile(projectRuntimeJar(":kotlin-compiler-embeddable"))
     compile(project(":kotlin-script-util"))

libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 dependencies {
     compile(project(":examples:scripting-jvm-maven-deps"))
     compile(project(":kotlin-scripting-jvm-host"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(project(":compiler:util"))
     runtime(project(":kotlin-reflect"))

libraries/kotlin.test/annotations-common/build.gradle

@@ -8,7 +8,7 @@ configurePublishing(project)
 
 
 dependencies {
-    compile project(':kotlin-stdlib-common')
+    compile kotlinStdlib("common")
     testCompile project(":kotlin-test:kotlin-test-common")
 }
 

libraries/kotlin.test/common/build.gradle

@@ -8,7 +8,7 @@ configurePublishing(project)
 
 
 dependencies {
-    compile project(':kotlin-stdlib-common')
+    compile kotlinStdlib("common")
     testCompile project(":kotlin-test:kotlin-test-annotations-common")
 }
 

libraries/kotlin.test/js/build.gradle

@@ -8,7 +8,7 @@ configurePublishing(project)
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-common')
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
-    compile project(':kotlin-stdlib-js')
+    compile kotlinStdlib("js")
 }
 
 compileKotlin2Js {

libraries/kotlin.test/jvm/build.gradle

@@ -17,7 +17,7 @@ sourceSets {
 
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-common')
-    compile project(':kotlin-stdlib')
+    compile kotlinStdlib()
     testCompile project(":kotlin-test:kotlin-test-junit")
     testCompile('junit:junit:4.12')
 }

libraries/kotlinx-metadata/build.gradle.kts

@@ -14,7 +14,7 @@ sourceSets {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly(project(":core:metadata"))
     compileOnly(protobufLite())
 }

libraries/kotlinx-metadata/jvm/build.gradle.kts

@@ -36,7 +36,7 @@ configurations.getByName("compileOnly").extendsFrom(shadows)
 configurations.getByName("testCompile").extendsFrom(shadows)
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     shadows(project(":kotlinx-metadata"))
     shadows(project(":core:metadata"))
     shadows(project(":core:metadata.jvm"))

libraries/reflect/api/build.gradle

@@ -14,7 +14,7 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':kotlin-stdlib')
+    compile kotlinStdlib()
     compileOnly project(':core:descriptors')
     compileOnly project(':core:descriptors.jvm')
     compileOnly project(':core:deserialization')

libraries/reflect/build.gradle.kts

@@ -47,9 +47,9 @@ configurations.getByName("compileOnly").extendsFrom(shadows)
 val mainJar by configurations.creating
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
 
-    proguardDeps(project(":kotlin-stdlib"))
+    proguardDeps(kotlinStdlib())
     proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
     proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String))))
 

libraries/scripting/common/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     runtime(project(":kotlin-reflect"))

libraries/scripting/intellij/build.gradle.kts

@@ -8,7 +8,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":kotlin-script-runtime"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-scripting-common"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }

libraries/scripting/jvm-host-embeddable/build.gradle.kts

@@ -11,7 +11,7 @@ val packedJars by configurations.creating
 dependencies {
     packedJars(project(":kotlin-scripting-jvm-host")) { isTransitive = false }
     runtime(project(":kotlin-script-runtime"))
-    runtime(project(":kotlin-stdlib"))
+    runtime(kotlinStdlib())
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
     runtime(project(":kotlin-script-util"))

libraries/scripting/jvm-host/build.gradle.kts

@@ -8,7 +8,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":kotlin-script-runtime"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
     compile(project(":kotlin-script-util"))

libraries/scripting/jvm/build.gradle.kts

@@ -8,7 +8,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":kotlin-script-runtime"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-scripting-common"))
 }
 

libraries/tools/idl2k/build.gradle

@@ -18,7 +18,7 @@ project.sourceSets.main.antlr.srcDirs = ["src/main/antlr4"]
 dependencies {
     antlr "org.antlr:antlr4:$antlr4_version"
     implementation "org.antlr:antlr4-runtime:$antlr4_version"
-    implementation project(':kotlin-stdlib')
+    implementation kotlinStdlib()
     implementation "org.jsoup:jsoup:1.8.2"
 
     testImplementation "junit:junit:4.12"

libraries/tools/kotlin-allopen/build.gradle

@@ -12,7 +12,7 @@ dependencies {
     compile project(':kotlin-gradle-plugin-api')
     compile project(':kotlin-gradle-plugin-model')
 
-    compile project(':kotlin-stdlib')
+    compile kotlinStdlib()
     compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar')
     compileOnly project(':kotlin-allopen-compiler-plugin')
 

libraries/tools/kotlin-annotation-processing/build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 val packedJars by configurations.creating
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     packedJars(project(":kotlin-annotation-processing")) { isTransitive = false }
     runtime(projectRuntimeJar(":kotlin-compiler-embeddable"))
 }

libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts

@@ -11,7 +11,7 @@ standardPublicJars()
 publish()
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-native:kotlin-native-utils"))
 
     compileOnly(gradleApi())

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
     testRuntime(projectRuntimeJar(":kotlin-gradle-plugin-test-utils-embeddable"))
 
     testCompile(project(path = ":examples:annotation-processor-example"))
-    testCompile(project(":kotlin-stdlib-jdk8"))
+    testCompile(kotlinStdlib("jdk8"))
     testCompile(project(":kotlin-reflect"))
     testCompile(project(":kotlin-android-extensions"))
     testCompile(commonDep("org.jetbrains.intellij.deps", "trove4j"))

libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts

@@ -10,7 +10,7 @@ standardPublicJars()
 publish()
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
 }
 
 tasks {

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -35,7 +35,7 @@ dependencies {
     compileOnly(project(":compiler:incremental-compilation-impl"))
     compileOnly(project(":compiler:daemon-common"))
 
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-native:kotlin-native-utils"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(project(":kotlin-android-extensions"))

libraries/tools/kotlin-main-kts/build.gradle.kts

@@ -46,7 +46,7 @@ dependencies {
     proguardLibraryJars(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar"),
                               firstFromJavaHomeThatExists("jre/lib/jsse.jar", "../Classes/jsse.jar"),
                               toolsJar()))
-    proguardLibraryJars(project(":kotlin-stdlib"))
+    proguardLibraryJars(kotlinStdlib())
     proguardLibraryJars(project(":kotlin-reflect"))
 }
 

libraries/tools/kotlin-noarg/build.gradle

@@ -18,7 +18,7 @@ dependencies {
     compile project(':kotlin-gradle-plugin-api')
     compile project(':kotlin-gradle-plugin-model')
 
-    compile project(':kotlin-stdlib')
+    compile kotlinStdlib()
     compileOnly project(':compiler')
     compileOnly project(':kotlin-noarg-compiler-plugin')
 

libraries/tools/kotlin-sam-with-receiver/build.gradle

@@ -18,7 +18,7 @@ dependencies {
     compile project(':kotlin-gradle-plugin-api')
     compile project(':kotlin-gradle-plugin-model')
 
-    compile project(':kotlin-stdlib')
+    compile kotlinStdlib()
     compileOnly project(':compiler')
     compileOnly project(':kotlin-sam-with-receiver-compiler-plugin')
 

libraries/tools/kotlin-script-util/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
     compile(project(":kotlin-scripting-jvm"))
     compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))

libraries/tools/kotlin-serialization/build.gradle

@@ -13,7 +13,7 @@ dependencies {
     compileOnly project(':kotlin-gradle-plugin')
     compileOnly project(':kotlin-gradle-plugin-api')
 
-    compileOnly project(':kotlin-stdlib')
+    compileOnly kotlinStdlib()
     compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar')
 }
 

libraries/tools/script-runtime/build.gradle

@@ -12,7 +12,7 @@ pill {
 }
 
 dependencies {
-    compileOnly project(':kotlin-stdlib')
+    compileOnly kotlinStdlib()
 }
 
 configurations {

plugins/allopen/allopen-cli/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     compileOnly(project(":compiler:frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
-    runtime(project(":kotlin-stdlib"))
+    runtime(kotlinStdlib())
 
     testRuntimeOnly(intellijDep()) {
         includeJars("guava", rootProject = rootProject)

plugins/android-extensions/android-extensions-runtime/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly(commonDep("com.google.android", "android"))
 }
 

plugins/kapt3/kapt3-base/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
     testCompile(commonDep("junit:junit"))
 }

plugins/kapt3/kapt3-idea/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":compiler:frontend"))
     compile(project(":idea")) { isTransitive = false }
     compile(project(":idea:kotlin-gradle-tooling"))

plugins/kapt3/kapt3-runtime/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
 }
 
 jvmTarget = "1.6"

plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     compile(project(":js:js.frontend"))
     compile(project(":js:js.translator"))
 
-    runtime(project(":kotlin-stdlib"))
+    runtime(kotlinStdlib())
 }
 
 sourceSets {

plugins/noarg/noarg-cli/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     compileOnly(project(":compiler:plugin-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
-    runtime(project(":kotlin-stdlib"))
+    runtime(kotlinStdlib())
     testRuntimeOnly(intellijDep()) {
         includeJars("guava", rootProject = rootProject)
     }

plugins/scripting/scripting-cli/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     compileOnly(project(":compiler:cli"))
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }

plugins/uast-kotlin-idea/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":core:util.runtime"))
     compile(project(":compiler:backend"))
     compile(project(":compiler:frontend.java"))

plugins/uast-kotlin/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":core:util.runtime"))
     compile(project(":compiler:backend"))
     compile(project(":compiler:frontend"))

prepare/compiler-client-embeddable/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testRuntimeCompilerJar(project(":kotlin-compiler"))
-    testStdlibJar(project(":kotlin-stdlib"))
+    testStdlibJar(kotlinStdlib())
     testScriptRuntimeJar(project(":kotlin-script-runtime"))
 }
 

prepare/compiler-embeddable/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    runtime(project(":kotlin-stdlib"))
+    runtime(kotlinStdlib())
     runtime(project(":kotlin-script-runtime"))
     runtime(project(":kotlin-reflect"))
     runtime(commonDep("org.jetbrains.intellij.deps", "trove4j"))

prepare/compiler/build.gradle.kts

@@ -47,7 +47,7 @@ val compiledModulesSources = compilerModules.map {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
     compile(project(":kotlin-reflect"))
     compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))

prepare/compiler/build.gradle.kts.182

@@ -47,7 +47,7 @@ val compiledModulesSources = compilerModules.map {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
     compile(project(":kotlin-reflect"))
     compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))

prepare/compiler/build.gradle.kts.as34

@@ -47,7 +47,7 @@ val compiledModulesSources = compilerModules.map {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
     compile(project(":kotlin-reflect"))
     compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))

prepare/idea-plugin/build.gradle.kts

@@ -78,9 +78,9 @@ dependencies {
     packedJars(protobufFull())
     packedJars(project(":core:builtins"))
     sideJars(project(":kotlin-script-runtime"))
-    sideJars(project(":kotlin-stdlib"))
+    sideJars(kotlinStdlib())
-    sideJars(project(":kotlin-stdlib-jdk7"))
+    sideJars(kotlinStdlib("jdk7"))
-    sideJars(project(":kotlin-stdlib-jdk8"))
+    sideJars(kotlinStdlib("jdk8"))
     sideJars(project(":kotlin-reflect"))
     sideJars(project(":kotlin-compiler-client-embeddable"))
     sideJars(commonDep("io.javaslang", "javaslang"))

settings.gradle

@@ -112,7 +112,6 @@ include ":kotlin-build-common",
         ":plugins:uast-kotlin-idea",
         ":plugins:annotation-based-compiler-plugins-ide-support",
         ":kotlin-script-runtime",
-        ":kotlin-runtime",
         ":kotlin-test",
         ":kotlin-test:kotlin-test-common",
         ":kotlin-test:kotlin-test-annotations-common",
@@ -122,15 +121,6 @@ include ":kotlin-build-common",
         ":kotlin-test:kotlin-test-testng",
         ":kotlin-test:kotlin-test-js",
         ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
-        ":kotlin-stdlib-common",
-        ":kotlin-stdlib",
-        ":kotlin-stdlib-js",
-        ":kotlin-stdlib-jre7",
-        ":kotlin-stdlib-jre8",
-        ":kotlin-stdlib-jdk7",
-        ":kotlin-stdlib-jdk8",
-        ":kotlin-stdlib:samples",
-        ":kotlin-stdlib:jvm-minimal-for-test",
         ":kotlinx-metadata",
         ":kotlinx-metadata-jvm",
         ":prepare:build.version",
@@ -151,9 +141,6 @@ include ":kotlin-build-common",
         ":compiler:tests-spec",
         ":generators",
         ":generators:test-generator",
-        ":tools:binary-compatibility-validator",
-        ":tools:kotlin-stdlib-js-merger",
-        ":tools:kotlin-stdlib-gen",
         ":tools:kotlinp",
         ":kotlin-gradle-plugin-api",
         ":kotlin-gradle-plugin-dsl-codegen",
@@ -196,7 +183,6 @@ include ":kotlin-build-common",
         ":libraries:kotlin-prepush-hook",
         ":libraries:tools:mutability-annotations-compat",
         ":include:kotlin-compiler",
-        ":include:kotlin-stdlib-common-sources",
         ":plugins:jvm-abi-gen",
         ":usage-statistics",
 
@@ -232,9 +218,45 @@ if (isTeamcityBuild || includeUltimate) {
     )
 }
 
+def includeStdlib = !hasProperty("useBootstrapStdlib") || useBootstrapStdlib == 'false'
+if (includeStdlib) {
+    include ":kotlin-stdlib-common",
+            ":kotlin-stdlib",
+            ":kotlin-stdlib-js",
+            ":kotlin-stdlib-jre7",
+            ":kotlin-stdlib-jre8",
+            ":kotlin-stdlib-jdk7",
+            ":kotlin-stdlib-jdk8",
+            ":kotlin-stdlib:samples",
+            ":kotlin-stdlib:jvm-minimal-for-test",
+            ":tools:binary-compatibility-validator",
+            ":tools:kotlin-stdlib-js-merger",
+            ":tools:kotlin-stdlib-gen",
+            ":kotlin-runtime",
+
+            ":include:kotlin-stdlib-common-sources"
+}
+
 rootProject.name = "kotlin"
 
-project(':kotlin-runtime').projectDir = "$rootDir/libraries/stdlib/runtime" as File
+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
+    project(':kotlin-stdlib-jre7').projectDir = "$rootDir/libraries/stdlib/jre7" as File
+    project(':kotlin-stdlib-jre8').projectDir = "$rootDir/libraries/stdlib/jre8" as File
+    project(':kotlin-stdlib-jdk7').projectDir = "$rootDir/libraries/stdlib/jdk7" as File
+    project(':kotlin-stdlib-jdk8').projectDir = "$rootDir/libraries/stdlib/jdk8" as File
+    project(':kotlin-stdlib:samples').projectDir = "$rootDir/libraries/stdlib/samples" as File
+    project(":kotlin-stdlib:jvm-minimal-for-test").projectDir = "$rootDir/libraries/stdlib/jvm-minimal-for-test" as File
+
+    project(':tools:binary-compatibility-validator').projectDir = "$rootDir/libraries/tools/binary-compatibility-validator" as File
+    project(':tools:kotlin-stdlib-js-merger').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-js-merger" as File
+    project(':tools:kotlin-stdlib-gen').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-gen" as File
+
+    project(':kotlin-runtime').projectDir = "$rootDir/libraries/stdlib/runtime" as File
+}
+
 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
@@ -245,15 +267,6 @@ project(':kotlin-test:kotlin-test-junit5').projectDir = "$rootDir/libraries/kotl
 project(':kotlin-test:kotlin-test-testng').projectDir = "$rootDir/libraries/kotlin.test/testng" as File
 project(':kotlin-test:kotlin-test-js').projectDir = "$rootDir/libraries/kotlin.test/js" as File
 project(':kotlin-test:kotlin-test-js:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File
-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
-project(':kotlin-stdlib-jre7').projectDir = "$rootDir/libraries/stdlib/jre7" as File
-project(':kotlin-stdlib-jre8').projectDir = "$rootDir/libraries/stdlib/jre8" as File
-project(':kotlin-stdlib-jdk7').projectDir = "$rootDir/libraries/stdlib/jdk7" as File
-project(':kotlin-stdlib-jdk8').projectDir = "$rootDir/libraries/stdlib/jdk8" as File
-project(':kotlin-stdlib:samples').projectDir = "$rootDir/libraries/stdlib/samples" as File
-project(":kotlin-stdlib:jvm-minimal-for-test").projectDir = "$rootDir/libraries/stdlib/jvm-minimal-for-test" as File
 project(':kotlin-reflect').projectDir = "$rootDir/libraries/reflect" as File
 project(':kotlin-reflect-api').projectDir = "$rootDir/libraries/reflect/api" as File
 project(':kotlinx-metadata').projectDir = "$rootDir/libraries/kotlinx-metadata" as File
@@ -291,9 +304,6 @@ project(':noarg-ide-plugin').projectDir = "$rootDir/plugins/noarg/noarg-ide" as
 project(':kotlin-sam-with-receiver-compiler-plugin').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver-cli" as File
 project(':sam-with-receiver-ide-plugin').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver-ide" as File
 project(':kotlin-source-sections-compiler-plugin').projectDir = "$rootDir/plugins/source-sections/source-sections-compiler" as File
-project(':tools:binary-compatibility-validator').projectDir = "$rootDir/libraries/tools/binary-compatibility-validator" as File
-project(':tools:kotlin-stdlib-js-merger').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-js-merger" as File
-project(':tools:kotlin-stdlib-gen').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-gen" as File
 project(':tools:kotlinp').projectDir = "$rootDir/libraries/tools/kotlinp" as File
 project(':kotlin-gradle-plugin-api').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-api" as File
 project(':kotlin-gradle-plugin-dsl-codegen').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-dsl-codegen" as File

test-instrumenter/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
 }

ultimate/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     }
 
     compileOnly(project(":kotlin-reflect-api"))
-    compile(project(":kotlin-stdlib"))
+    compile(kotlinStdlib())
     compile(project(":core:descriptors")) { isTransitive = false }
     compile(project(":compiler:psi")) { isTransitive = false }
     compile(project(":core:descriptors.jvm")) { isTransitive = false }