Force bootstrap stdlib in modules that used in composite build

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)

compiler/util-io/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 description = "Kotlin/Native utils"
 
 dependencies {
-    compile(kotlinStdlib())
+    compile(kotlinStdlib(forceBootstrap = true))
 }
 
 sourceSets {

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"))
 }
 

libraries/commonConfiguration.gradle

@@ -211,6 +211,6 @@ allprojects { project ->
     }
 
     dependencies.ext.kotlinStdlib = { suffix ->
-        DependenciesKt.kotlinStdlib(project, suffix, null)
+        DependenciesKt.kotlinStdlib(project, suffix, null, false)
     }
 }

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"))