Fix JPS build for using kotlin-stdlib withJvmBuiltins

This reverts commit 769c741d

libraries/stdlib/jvm/build.gradle

@@ -11,6 +11,7 @@ configureSourcesJar()
 
 configurations {
     distSources
+    withJvmBuiltins.extendsFrom(configurations.compile)
 }
 
 sourceSets {
@@ -46,6 +47,7 @@ configurations {
             attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements, LibraryElements.JAR))
         }
     }
+    builtinsJvm
     compileOnly.extendsFrom(builtins)
 }
 
@@ -60,6 +62,7 @@ dependencies {
     testCompile project(':kotlin-coroutines-experimental-compat')
 
     builtins project(':core:builtins')
+    builtinsJvm project(path: ':core:builtins', configuration: "runtimeElementsJvm")
 }
 
 jar {
@@ -97,11 +100,26 @@ configureModularJar {
     from zipTree(jar.outputs.files.singleFile)
 }
 
+task withJvmBuiltinsJar(type: Jar) {
+    dependsOn(jar)
+    dependsOn(configurations.builtinsJvm)
+    manifestAttributes(manifest, project, 'Main', true)
+    destinationDirectory = file("$buildDir/lib/with-jvm-builtins")
+
+    from(zipTree(jar.outputs.files.singleFile)) {
+        exclude("**/*.kotlin_builtins")
+    }
+    from {
+        zipTree(configurations.builtinsJvm.singleFile)
+    }
+}
+
 artifacts {
     archives sourcesJar
     sources sourcesJar
     distSources distSourcesJar
     archives modularJar
+    withJvmBuiltins withJvmBuiltinsJar
 }
 
 DexMethodCountKt.dexMethodCount(project) { task ->

prepare/idea-plugin/build.gradle.kts

@@ -174,13 +174,29 @@ dependencies {
     embedded(protobufFull())
     embedded(kotlinBuiltins(forJvm = true))
 
-    libraries(commonDep(kotlinxCollectionsImmutable()))
-    libraries(commonDep("javax.inject"))
-    libraries(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8"))
-    libraries(commonDep("org.jetbrains", "markdown"))
-    libraries(commonDep("io.javaslang", "javaslang"))
+    if (kotlinBuildProperties.useBootstrapStdlib) {
+        libraries(kotlinStdlib())
+        libraries(kotlinDep(listOfNotNull("stdlib", null).joinToString("-"), bootstrapKotlinVersion, null)) {
+            exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+        }
+    } else {
+        libraries(project(":kotlin-stdlib", "withJvmBuiltins"))
+        libraries(project(":kotlin-stdlib-jdk8")) {
+            exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+        }
+    }
 
-    libraries(kotlinStdlib("jdk8"))
+    libraries(commonDep(kotlinxCollectionsImmutable())) {
+        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+    }
+    libraries(commonDep("javax.inject"))
+    libraries(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) {
+        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+    }
+    libraries(commonDep("org.jetbrains", "markdown")) {
+        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+    }
+    libraries(commonDep("io.javaslang", "javaslang"))
 
     Platform[193].orHigher {
         libraries(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin"))