From a9fec21178bb1f309f3e783f9814ed00e815a2a5 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 28 Dec 2019 04:05:13 +0300
Subject: [PATCH] [JS IR] stdlib: switch between artifacts rather than artifact
 content

The switch `includeStdlibJsIr` now affects which artifact is published:
the one with IR or the one without. Previously it affected
whether or not IR was bundled into the artifact "with IR".
---
 libraries/kotlin.test/js/build.gradle | 11 +++++------
 libraries/stdlib/js-v1/build.gradle   | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index 891209eace3..a5fbefec7ba 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -59,11 +59,10 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
     duplicatesStrategy DuplicatesStrategy.FAIL
 
     from zipTree(libraryJarWithoutIr.archiveFile)
-    if (rootProject.includeStdlibJsIr) {
-        def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:generateKotlinTestKLib")
-        dependsOn(irKlib)
-        from fileTree("${irKlib.outputs.files.singleFile.path}/klib")
-    }
+
+    def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:generateKotlinTestKLib")
+    dependsOn(irKlib)
+    from fileTree("${irKlib.outputs.files.singleFile.path}/klib")
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
@@ -73,7 +72,7 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 
 artifacts {
     runtime libraryJarWithoutIr
-    archives libraryJarWithIr
+    archives rootProject.includeStdlibJsIr ? libraryJarWithIr : libraryJarWithoutIr
     distLibrary libraryJarWithoutIr
     archives sourcesJar
     sources sourcesJar
diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle
index c5695da6647..1ab52650ea1 100644
--- a/libraries/stdlib/js-v1/build.gradle
+++ b/libraries/stdlib/js-v1/build.gradle
@@ -317,11 +317,10 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
     duplicatesStrategy DuplicatesStrategy.FAIL
 
     from zipTree(libraryJarWithoutIr.archiveFile)
-    if (rootProject.includeStdlibJsIr) {
-        def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:generateFullRuntimeKLib")
-        dependsOn(irKlib)
-        from fileTree("${irKlib.outputs.files.singleFile.path}/klib")
-    }
+
+    def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:generateFullRuntimeKLib")
+    dependsOn(irKlib)
+    from fileTree("${irKlib.outputs.files.singleFile.path}/klib")
 }
 
 
@@ -371,7 +370,7 @@ task distSourcesJar(type: Jar) {
 
 artifacts {
     runtime libraryJarWithoutIr
-    archives libraryJarWithIr
+    archives rootProject.includeStdlibJsIr ? libraryJarWithIr : libraryJarWithoutIr
     archives sourcesJar
     sources sourcesJar
     distSources distSourcesJar