[Gradle, JS] Fix build for legacy browser with binaries

This commit is contained in:
Ilya Goncharov
2020-02-26 19:30:39 +03:00
parent b25418df69
commit 3a262c6eb8
2 changed files with 10 additions and 4 deletions
@@ -61,4 +61,12 @@ class Executable(
type, type,
null null
) )
} }
// Hack for legacy
internal val JsBinary.executeTaskBaseName: String
get() = generateBinaryName(
compilation,
type,
null
)
@@ -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.KotlinJsTarget
import org.jetbrains.kotlin.gradle.targets.js.dsl.* 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.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.nodejs.NodeJsRootPlugin
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
@@ -173,10 +174,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
assembleTask.dependsOn(distributeResourcesTask) assembleTask.dependsOn(distributeResourcesTask)
compilation.binaries compilation.binaries
.matching { it is Executable }
.all { binary -> .all { binary ->
binary as Executable
val type = binary.type val type = binary.type
val webpackTask = project.registerTask<KotlinWebpack>( val webpackTask = project.registerTask<KotlinWebpack>(