From 769c741d876e6f14693d66da1beca3af43ac5847 Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Fri, 18 Sep 2020 17:30:44 +0300
Subject: [PATCH] Revert "Pack jvm builtins into kotlin-stdlib shipped with
 idea plugin"

This reverts commit 0b5aedb0a2cb3fe8966711f018f7b1a8b6b4496a.
---
 libraries/stdlib/jvm/build.gradle    | 18 ------------------
 prepare/idea-plugin/build.gradle.kts | 17 ++++-------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 32109410cec..e0249a98123 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -11,7 +11,6 @@ configureSourcesJar()
 
 configurations {
     distSources
-    withJvmBuiltins.extendsFrom(configurations.compile)
 }
 
 sourceSets {
@@ -47,7 +46,6 @@ configurations {
             attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements, LibraryElements.JAR))
         }
     }
-    builtinsJvm
     compileOnly.extendsFrom(builtins)
 }
 
@@ -62,7 +60,6 @@ dependencies {
     testCompile project(':kotlin-coroutines-experimental-compat')
 
     builtins project(':core:builtins')
-    builtinsJvm project(path: ':core:builtins', configuration: "runtimeElementsJvm")
 }
 
 jar {
@@ -100,26 +97,11 @@ 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 ->
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index a470cddbdfc..1c1cc5a6265 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -172,22 +172,13 @@ dependencies {
     embedded(protobufFull())
     embedded(kotlinBuiltins(forJvm = true))
 
-    libraries(project(":kotlin-stdlib", "withJvmBuiltins"))
-    libraries(commonDep(kotlinxCollectionsImmutable())) {
-        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
-    }
+    libraries(commonDep(kotlinxCollectionsImmutable()))
     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("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8"))
+    libraries(commonDep("org.jetbrains", "markdown"))
     libraries(commonDep("io.javaslang", "javaslang"))
 
-    libraries(project(":kotlin-stdlib-jdk8")) {
-        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
-    }
+    libraries(kotlinStdlib("jdk8"))
 
     Platform[193].orHigher {
         libraries(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin"))