Revert [JS IR] commits that failed build

Revert "[JS IR] Build hybrid versions of stdlib and kotlin.test"
This reverts commit b9f88350dd.

Revert "[JS IR] Add gradle plugin integration tests"
This reverts commit d872b27663.

Revert "Update bootstrap"
This reverts commit bc47594c7a.

Revert "[JS IR] Support generating both IR and pre-IR libraries"
This reverts commit 1b8df45bfe.

libraries/stdlib/js-ir/build.gradle

@@ -92,7 +92,7 @@ configurations {
 dependencies {
     expectedBy project(":kotlin-stdlib-common")
     commonSources project(path: ":kotlin-stdlib-common", configuration: "sources")
-    testCompile project(':kotlin-test:kotlin-test-js')
+    testCompile project(':kotlin-test:kotlin-test-js-ir')
 }
 
 
@@ -107,8 +107,8 @@ compileKotlin2Js {
         main = "noCall"
         verbose = true
         freeCompilerArgs += [
-            "-Xir-produce-klib-dir",
-            "-Xir-only",
+            "-Xir",
+            "-Xir-produce-only=klib",
             "-Xallow-kotlin-package",
             "-Xallow-result-return-type",
             "-Xuse-experimental=kotlin.Experimental",
@@ -120,7 +120,7 @@ compileKotlin2Js {
 }
 
 def testOutputFile = "${buildDir}/classes/kotlin/test/kotlin-stdlib-js-ir_test.js"
-def kotlinTestTestOutputFile = "${project(':kotlin-test:kotlin-test-js').buildDir}/classes/kotlin/test/kotlin-test-js-ir_test.js"
+def kotlinTestTestOutputFile = "${project(':kotlin-test:kotlin-test-js-ir').buildDir}/classes/kotlin/test/kotlin-test-js-ir_test.js"
 
 compileTestKotlin2Js {
     kotlinOptions {
@@ -128,7 +128,8 @@ compileTestKotlin2Js {
         verbose = true
         outputFile = testOutputFile
         freeCompilerArgs += [
-          "-Xir-produce-js",
+          "-Xir",
+          "-Xir-produce-only=js",
           "-verbose",
           "-Xuse-experimental=kotlin.Experimental",
           "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
@@ -154,6 +155,11 @@ artifacts {
     archives sourcesJar
 }
 
+
+if (project.findProperty("kotlin.stdlib.js.ir.publish")?.toBoolean() == true) {
+    configurePublishing(project)
+}
+
 node {
     download = true
     version = '8.9.4' // The default 6.9.1 has buggy hyperbolic functions implementation
@@ -171,7 +177,7 @@ task installTeamcityReporter(type: NpmTask) {
 task runMocha(type: NodeTask) {
     dependsOn compileTestKotlin2Js
     dependsOn installMocha
-    dependsOn ':kotlin-test:kotlin-test-js:testClasses'
+    dependsOn ':kotlin-test:kotlin-test-js-ir:testClasses'
 
     script = file("${buildDir}/node_modules/mocha/bin/mocha")
 

libraries/stdlib/js-v1/build.gradle

@@ -14,7 +14,6 @@ configurations {
     commonSources
     distSources
     distJs
-    distLibrary
 }
 
 def builtinsSrcDir = "${buildDir}/builtin-sources"
@@ -284,10 +283,9 @@ jar {
     enabled false
 }
 
-task libraryJarWithoutIr(type: Jar, dependsOn: compileJs) {
+task mergedJar(type: Jar, dependsOn: compileJs) {
     classifier = null
     manifestAttributes(manifest, project, 'Main')
-    destinationDirectory = file("$buildDir/lib/dist")
 
     // TODO: Use standard implementation title after js stdlib detector becomes more flexible (KT-17655)
     Properties properties = new Properties()
@@ -309,22 +307,6 @@ task libraryJarWithoutIr(type: Jar, dependsOn: compileJs) {
     exclude "${experimentalJsModuleName}.*"
 }
 
-task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
-    def irStdlibJar = tasks.getByPath(":kotlin-stdlib-js-ir:jar")
-    dependsOn(irStdlibJar)
-
-    archiveExtension = "jar"
-    destinationDirectory = file("$buildDir/libs")
-
-    duplicatesStrategy DuplicatesStrategy.FAIL
-
-    from zipTree(libraryJarWithoutIr.archiveFile)
-    from(zipTree(irStdlibJar.archiveFile)) {
-        exclude 'META-INF/*'
-    }
-}
-
-
 task sourcesJar(type: Jar, dependsOn: compileJs) {
     classifier = 'sources'
     includeEmptyDirs false
@@ -370,12 +352,11 @@ task distSourcesJar(type: Jar) {
 
 
 artifacts {
-    runtime libraryJarWithIr
-    archives libraryJarWithIr
+    runtime mergedJar
+    archives mergedJar
     archives sourcesJar
     sources sourcesJar
     distSources distSourcesJar
-    distLibrary libraryJarWithoutIr
 
     compileJs.outputs.files.forEach { artifact ->
         distJs(artifact) { builtBy(compileJs) }