From 3a262c6eb873c09745315461af9e75581ae78ea8 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 26 Feb 2020 19:30:39 +0300 Subject: [PATCH] [Gradle, JS] Fix build for legacy browser with binaries --- .../kotlin/gradle/targets/js/ir/JsBinaries.kt | 10 +++++++++- .../gradle/targets/js/subtargets/KotlinBrowserJs.kt | 4 +--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaries.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaries.kt index 1f302a7bd78..8626df4c8c1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaries.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaries.kt @@ -61,4 +61,12 @@ class Executable( type, null ) -} \ No newline at end of file +} + +// Hack for legacy +internal val JsBinary.executeTaskBaseName: String + get() = generateBinaryName( + compilation, + type, + null + ) \ No newline at end of file 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 843c94ab2ff..781c763aa71 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 @@ -16,6 +16,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget import org.jetbrains.kotlin.gradle.targets.js.dsl.* import org.jetbrains.kotlin.gradle.targets.js.ir.Executable +import org.jetbrains.kotlin.gradle.targets.js.ir.executeTaskBaseName import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest @@ -173,10 +174,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : assembleTask.dependsOn(distributeResourcesTask) compilation.binaries - .matching { it is Executable } .all { binary -> - binary as Executable - val type = binary.type val webpackTask = project.registerTask(