From 68dd89c593babb3ec864117b3cc10cfd0a9cf62c Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 27 Mar 2023 09:32:09 +0000 Subject: [PATCH] [Gradle, JS] Fix binaryen registering tasks ^KT-57203 fixed --- .../kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt | 2 -- .../kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt | 3 --- 2 files changed, 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index de3d851bb18..39ba84b5538 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -1987,10 +1987,8 @@ open class NewMultiplatformIT : BaseGradleIT() { build(":wasm${name}Test") { assertTasksExecuted(":compileKotlinWasm") if (useBinaryen) { - assertTasksExecuted(":compileTestProductionExecutableKotlinWasmOptimize") assertTasksExecuted(":compileTestDevelopmentExecutableKotlinWasmOptimize") } else { - assertTasksNotExecuted(":compileTestProductionExecutableKotlinWasmOptimize") assertTasksNotExecuted(":compileTestDevelopmentExecutableKotlinWasmOptimize") } assertTasksFailed(":wasm${name}Test") diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt index 479784e50bc..d85eb8969be 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt @@ -56,9 +56,6 @@ constructor( binaryenDsl() } - binary.compilation.compileTaskProvider.configure { - it.finalizedBy(binaryenTask) - } binary.linkSyncTask.configure { it.dependsOn(binaryenTask) }