JPS Build: exclude :core:builtins, use prebuilt bootstrap version

buildSrc/src/main/kotlin/buildProperties.kt

@@ -52,6 +52,9 @@ class KotlinBuildProperties(
 
     val includeJava9: Boolean
         get() = !isInJpsBuildIdeaSync
+
+    val useBootstrapStdlib: Boolean
+        get() = isInJpsBuildIdeaSync
 }
 
 private const val extensionName = "kotlinBuildFlags"

buildSrc/src/main/kotlin/dependencies.kt

@@ -75,16 +75,17 @@ 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() = kotlinBuildProperties.isInJpsBuildIdeaSync
-
 fun Project.kotlinStdlib(suffix: String? = null): Any {
-    return if (useBootstrapStdlib)
+    return if (kotlinBuildProperties.useBootstrapStdlib)
         kotlinDep(listOfNotNull("stdlib", suffix).joinToString("-"), bootstrapKotlinVersion)
     else
         dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-"))
 }
 
+fun Project.kotlinBuiltins(): Any =
+    if (kotlinBuildProperties.useBootstrapStdlib) "org.jetbrains.kotlin:builtins:$bootstrapKotlinVersion"
+    else dependencies.project(":core:builtins")
+
 fun DependencyHandler.projectTests(name: String): ProjectDependency = project(name, configuration = "tests-jar")
 fun DependencyHandler.projectRuntimeJar(name: String): ProjectDependency = project(name, configuration = "runtimeJar")
 fun DependencyHandler.projectArchives(name: String): ProjectDependency = project(name, configuration = "archives")