From f169c8ea24bfe17bd88cf7e7dea759724b3c6715 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 21 Jan 2020 14:27:09 +0300 Subject: [PATCH] [Gradle, JS] Flags with producing unzipped klib is by default --- .../kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt | 6 +++--- .../gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt index 49751800f1c..f08561c63ab 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt @@ -57,11 +57,11 @@ abstract class KotlinJsIrSubTarget( } override fun produceKotlinLibrary() { - produceByFlags(PRODUCE_UNZIPPED_KLIB) + produceByFlags() } override fun produceJs() { - produceByFlags(PRODUCE_UNZIPPED_KLIB) + produceByFlags() configureMain() } @@ -73,7 +73,7 @@ abstract class KotlinJsIrSubTarget( .matching { it.name == KotlinCompilation.TEST_COMPILATION_NAME } .all { it.kotlinOptions { - freeCompilerArgs += listOf(PRODUCE_UNZIPPED_KLIB, PRODUCE_JS) + freeCompilerArgs += PRODUCE_JS } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt index dd6845616b4..65a7952ccda 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt @@ -61,7 +61,10 @@ open class KotlinJsIrTargetConfigurator(kotlinPluginVersion: String) : it.compileKotlinTask.kotlinOptions { configureOptions() - freeCompilerArgs += DISABLE_PRE_IR + freeCompilerArgs += listOf( + DISABLE_PRE_IR, + PRODUCE_UNZIPPED_KLIB + ) } it.productionLinkTask.configure()