diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithJsPresetFunctions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithJsPresetFunctions.kt index 21352334551..b10df70faac 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithJsPresetFunctions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithJsPresetFunctions.kt @@ -106,7 +106,7 @@ private fun KotlinTargetContainerWithJsPresetFunctions.jsInternal( presets.getByName( lowerCamelCaseName( "js", - if (compilerOrDefault == KotlinJsCompilerType.LEGACY) null else compilerOrDefault.lowerName + if (compilerOrDefault == KotlinJsCompilerType.IR) null else compilerOrDefault.lowerName ) ) as KotlinTargetPreset, configure diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargets.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargets.kt index 8458bdfe62e..82837b455cc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargets.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargets.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget fun KotlinJsTargetDsl.calculateJsCompilerType(): KotlinJsCompilerType { return when { this is KotlinJsTarget && !this.mixedMode -> KotlinJsCompilerType.LEGACY - this is KotlinJsIrTarget && this.legacyTarget == null -> KotlinJsCompilerType.IR + this is KotlinJsIrTarget && this.legacyTarget == null -> KotlinJsCompilerType.IR this is KotlinJsIrTarget && this.legacyTarget != null -> KotlinJsCompilerType.BOTH else -> throw IllegalStateException("Unable to find previous Kotlin/JS compiler type for $this") } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinWasmTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinWasmTargetPreset.kt index 6a44259b629..9d35a021383 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinWasmTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinWasmTargetPreset.kt @@ -26,7 +26,7 @@ class KotlinWasmTargetPreset( project.logger.warn("New 'wasm' target is Work-in-Progress and is subject to change without notice.") } - val irTarget = project.objects.newInstance(KotlinJsIrTarget::class.java, project, KotlinPlatformType.wasm, false) + val irTarget = project.objects.newInstance(KotlinJsIrTarget::class.java, project, KotlinPlatformType.wasm) irTarget.isMpp = true project.runProjectConfigurationHealthCheckWhenEvaluated {