From 3467230242ac55605fd5ffb079c52379c294c2fe Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Tue, 21 Jan 2020 16:42:38 +0300
Subject: [PATCH] [Gradle, JS] Add appendix for archive in case of mixed mode

---
 .../gradle/targets/js/KotlinJsTargetConfigurator.kt   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt
index 494d0a6658d..7ccbfdbeaff 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.gradle.targets.js
 
+import org.gradle.api.tasks.bundling.Jar
 import org.gradle.language.base.plugins.LifecycleBasePlugin
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.plugin.Kotlin2JsSourceSetProcessor
@@ -12,6 +13,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinOnlyTargetConfigurator
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetProcessor
 import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTestsConfigurator
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.defaultSourceSetName
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetConfigurator
 import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider
@@ -90,6 +92,15 @@ open class KotlinJsTargetConfigurator(kotlinPluginVersion: String, val irConfigu
         }
     }
 
+    override fun createJarTasks(target: KotlinOnlyTarget<KotlinJsCompilation>) {
+        super.createJarTasks(target)
+        val jar = target.project.tasks.getByName(target.artifactsTaskName) as Jar
+
+        if (irConfigurator != null) {
+            jar.archiveAppendix.set("legacyJs")
+        }
+    }
+
     override fun configureCompilations(target: KotlinJsTarget) {
         super.configureCompilations(target)