Use JS stdlib merger from bootstrap compiler

2019-02-21 03:21:27 +03:00
parent 0a0f81486f
commit 8f6d73fd32
4 changed files with 2 additions and 161 deletions
@@ -234,7 +234,6 @@ if (isJpsBuild) {
            ":kotlin-stdlib:samples",
            ":kotlin-stdlib:jvm-minimal-for-test",
            ":tools:binary-compatibility-validator",
-            ":tools:kotlin-stdlib-js-merger",
            ":tools:kotlin-stdlib-gen",

            ":include:kotlin-stdlib-common-sources"
@@ -248,7 +247,6 @@ if (isJpsBuild) {
    project(":kotlin-stdlib:jvm-minimal-for-test").projectDir = "$rootDir/libraries/stdlib/jvm-minimal-for-test" as File

    project(':tools:binary-compatibility-validator').projectDir = "$rootDir/libraries/tools/binary-compatibility-validator" as File
-    project(':tools:kotlin-stdlib-js-merger').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-js-merger" as File
    project(':tools:kotlin-stdlib-gen').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-gen" as File
 }