From a1a046d1641489b09cdba39c447a2b8f6392320c Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 26 Jul 2023 19:40:28 +0200 Subject: [PATCH] [Gradle, JS] whole-program not produce compiler argument --- .../kotlin/gradle/targets/js/ir/OutputGranularity.kt | 4 ++-- .../kotlin/gradle/tasks/configuration/KotlinJsIrLinkConfig.kt | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/OutputGranularity.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/OutputGranularity.kt index 937daab7b7f..31979ebe474 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/OutputGranularity.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/OutputGranularity.kt @@ -17,10 +17,10 @@ enum class KotlinJsIrOutputGranularity { } } -fun KotlinJsIrOutputGranularity.toCompilerArgument(): String { +fun KotlinJsIrOutputGranularity.toCompilerArgument(): String? { return when (this) { KotlinJsIrOutputGranularity.PER_FILE -> PER_FILE KotlinJsIrOutputGranularity.PER_MODULE -> PER_MODULE - KotlinJsIrOutputGranularity.WHOLE_PROGRAM -> "" + KotlinJsIrOutputGranularity.WHOLE_PROGRAM -> null } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinJsIrLinkConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinJsIrLinkConfig.kt index 7801485dfd0..cb091cda648 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinJsIrLinkConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinJsIrLinkConfig.kt @@ -77,7 +77,9 @@ internal open class KotlinJsIrLinkConfig( val alreadyDefinedOutputMode = any { it.startsWith(PER_MODULE) } if (!alreadyDefinedOutputMode) { - add(task.outputGranularity.toCompilerArgument()) + task.outputGranularity.toCompilerArgument()?.let { + add(it) + } } } }