From ad76562cbc3e6c388a6f44b41566a7539c45b639 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 17 Apr 2020 21:31:42 +0300
Subject: [PATCH] Force bootstrap stdlib in modules that used in composite
 build

---
 buildSrc/src/main/kotlin/dependencies.kt | 4 ++--
 compiler/util-io/build.gradle.kts        | 2 +-
 compiler/util-klib/build.gradle.kts      | 2 +-
 libraries/commonConfiguration.gradle     | 2 +-
 native/utils/build.gradle.kts            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index f62aca7bd9f..6e3465316d8 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -81,8 +81,8 @@ fun Project.ideaUltimatePreloadedDeps(vararg artifactBaseNames: String, subdir:
 fun Project.kotlinDep(artifactBaseName: String, version: String, classifier: String? = null): String =
     listOfNotNull("org.jetbrains.kotlin:kotlin-$artifactBaseName:$version", classifier).joinToString(":")
 
-fun Project.kotlinStdlib(suffix: String? = null, classifier: String? = null): Any {
-    return if (kotlinBuildProperties.useBootstrapStdlib)
+fun Project.kotlinStdlib(suffix: String? = null, classifier: String? = null, forceBootstrap: Boolean = false): Any {
+    return if (forceBootstrap || kotlinBuildProperties.useBootstrapStdlib)
         kotlinDep(listOfNotNull("stdlib", suffix).joinToString("-"), bootstrapKotlinVersion, classifier)
     else
         dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-"), classifier)
diff --git a/compiler/util-io/build.gradle.kts b/compiler/util-io/build.gradle.kts
index 1389a367926..20e98aa5811 100644
--- a/compiler/util-io/build.gradle.kts
+++ b/compiler/util-io/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 description = "Kotlin/Native utils"
 
 dependencies {
-    compile(kotlinStdlib())
+    compile(kotlinStdlib(forceBootstrap = true))
 }
 
 sourceSets {
diff --git a/compiler/util-klib/build.gradle.kts b/compiler/util-klib/build.gradle.kts
index eff4b593822..25c2a496e53 100644
--- a/compiler/util-klib/build.gradle.kts
+++ b/compiler/util-klib/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 description = "Common klib reader and writer"
 
 dependencies {
-    compile(kotlinStdlib())
+    compile(kotlinStdlib(forceBootstrap = true))
     compile(project(":kotlin-util-io"))
 }
 
diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 686a9479154..6f1267c7622 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -211,6 +211,6 @@ allprojects { project ->
     }
 
     dependencies.ext.kotlinStdlib = { suffix ->
-        DependenciesKt.kotlinStdlib(project, suffix, null)
+        DependenciesKt.kotlinStdlib(project, suffix, null, false)
     }
 }
diff --git a/native/utils/build.gradle.kts b/native/utils/build.gradle.kts
index 1fbf58a8622..34df6bd50f5 100644
--- a/native/utils/build.gradle.kts
+++ b/native/utils/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 description = "Kotlin/Native utils"
 
 dependencies {
-    compileOnly(kotlinStdlib())
+    compileOnly(kotlinStdlib(forceBootstrap = true))
     compile(project(":kotlin-util-io"))
 
     testCompile(commonDep("junit:junit"))