From bdf76f926414ff7d1ff6150023342b91993e14ee Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 5 Feb 2020 13:20:29 +0300 Subject: [PATCH] fixup! [Gradle, JS] Fix review remarks - setup compiler args in appropriate fun - remove redundant --- .../gradle/targets/js/ir/KotlinJsIrLink.kt | 4 +++- .../targets/js/ir/KotlinJsIrSubTarget.kt | 24 ------------------- .../gradle/targets/js/ir/KotlinJsIrTarget.kt | 6 ++--- .../js/ir/KotlinJsIrTargetConfigurator.kt | 8 ------- .../targets/js/subtargets/KotlinBrowserJs.kt | 5 ---- .../targets/js/subtargets/KotlinNodeJs.kt | 5 ---- 6 files changed, 5 insertions(+), 47 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt index 6c284178e32..d879952ad0c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt @@ -9,6 +9,7 @@ import org.gradle.api.file.FileTree import org.gradle.api.file.RegularFileProperty import org.gradle.api.tasks.* import org.gradle.api.tasks.incremental.IncrementalTaskInputs +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrType.DEVELOPMENT import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrType.PRODUCTION @@ -45,7 +46,8 @@ open class KotlinJsIrLink : Kotlin2JsCompile() { outputFile } - internal fun configure() { + override fun setupCompilerArgs(args: K2JSCompilerArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) { + super.setupCompilerArgs(args, defaultsOnly, ignoreClasspathResolutionErrors) when (type) { PRODUCTION -> { kotlinOptions.configureOptions(ENABLE_DCE, GENERATE_D_TS) 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 6fb679240ab..cb9458499b5 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 @@ -54,34 +54,10 @@ abstract class KotlinJsIrSubTarget( } } - internal fun produceKotlinLibrary() { - produceByFlags() - } - internal fun produceExecutable() { - produceByFlags() - configureMain() } - private fun produceByFlags(vararg flags: String) { - target.compilations - .matching { it.name == KotlinCompilation.TEST_COMPILATION_NAME } - .all { - it.kotlinOptions { - freeCompilerArgs += PRODUCE_JS - } - } - - target.compilations - .matching { it.name == KotlinCompilation.MAIN_COMPILATION_NAME } - .all { - it.kotlinOptions { - freeCompilerArgs += flags.toList() - } - } - } - override fun testTask(body: KotlinJsTest.() -> Unit) { testRuns.getByName(KotlinTargetWithTests.DEFAULT_TEST_RUN_NAME).executionTask.configure(body) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt index b620e5aedea..e86244972c2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt @@ -86,9 +86,7 @@ constructor( } override fun produceKotlinLibrary() { - produce(KotlinJsProducingType.KOTLIN_LIBRARY) { - produceKotlinLibrary() - } + produce(KotlinJsProducingType.KOTLIN_LIBRARY) } override fun produceExecutable() { @@ -99,7 +97,7 @@ constructor( private fun produce( producingType: KotlinJsProducingType, - producer: KotlinJsIrSubTarget.() -> Unit + producer: KotlinJsIrSubTarget.() -> Unit = {} ) { check(this.producingType == null || this.producingType == producingType) { "Only one producing type supported. Try to set $producingType but previously ${this.producingType} found" 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 5b81eaa99e3..70c13504863 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 @@ -72,14 +72,6 @@ open class KotlinJsIrTargetConfigurator(kotlinPluginVersion: String) : PRODUCE_UNZIPPED_KLIB ) } - - it.productionLinkTask.configure { - it.configure() - } - - it.developmentLinkTask.configure { - it.configure() - } } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index 96d66f6ce01..ed334caf21e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -47,11 +47,6 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : private val irBrowser: KotlinBrowserJsIr? get() = target.irTarget?.browser - override fun produceKotlinLibrary() { - super.produceKotlinLibrary() - irBrowser?.produceKotlinLibrary() - } - override fun produceExecutable() { super.produceExecutable() irBrowser?.produceExecutable() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt index d38793f0b31..c53bb248836 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt @@ -24,11 +24,6 @@ open class KotlinNodeJs @Inject constructor(target: KotlinJsTarget) : private val irNodejs: KotlinNodeJsIr? get() = target.irTarget?.nodejs - override fun produceKotlinLibrary() { - super.produceKotlinLibrary() - irNodejs?.produceKotlinLibrary() - } - override fun produceExecutable() { super.produceExecutable() irNodejs?.produceExecutable()