Skip to content

Commit 8de0046

Browse files
committed
Fix composeCompatibilityBrowserDistribution task lazy configuration.
1 parent d695ac9 commit 8de0046

70 files changed

Lines changed: 286 additions & 959 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/tasks/WebCompatibilityTask.kt

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ abstract class WebCompatibilityTask : DefaultTask() {
4848
@TaskAction
4949
fun run() {
5050
val prefix = "origin"
51-
val jsAppFileName = jsOutputName.get()
51+
val jsAppFileName = jsOutputName.orNull ?: return
5252
val jsAppRenamed = joinLowerCamelCase(prefix, "js", jsAppFileName)
53-
val wasmAppFileName = wasmOutputName.get()
53+
val wasmAppFileName = wasmOutputName.orNull ?: return
5454
val wasmAppRenamed = joinLowerCamelCase(prefix, "wasm", wasmAppFileName)
5555

5656
fileOperations.clearDirs(outputDir)
@@ -137,17 +137,27 @@ private fun Project.registerWebCompatibilityTask(mppPlugin: KotlinMultiplatformE
137137
wasmOutputName.set(it.mainOutputFileName)
138138
}
139139

140-
wasmDistFiles.from(
141-
tasks.matching { it.name == "${target.name}BrowserDistribution" }.map { it.outputs.files }
142-
)
140+
val taskDistributionName = "${target.name}BrowserDistribution"
141+
wasmDistFiles.from(provider {
142+
if (tasks.names.contains(taskDistributionName)) {
143+
tasks.getByName(taskDistributionName).outputs.files
144+
} else {
145+
emptyList()
146+
}
147+
})
143148
} else if (target.platformType == KotlinPlatformType.js) {
144149
tasks.withType(KotlinWebpack::class.java).findByName("${target.name}BrowserProductionWebpack")?.let {
145150
jsOutputName.set(it.mainOutputFileName)
146151
}
147152

148-
jsDistFiles.from(
149-
tasks.matching { it.name == "${target.name}BrowserDistribution" }.map { it.outputs.files }
150-
)
153+
val taskDistributionName = "${target.name}BrowserDistribution"
154+
jsDistFiles.from(provider {
155+
if (tasks.names.contains(taskDistributionName)) {
156+
tasks.getByName(taskDistributionName).outputs.files
157+
} else {
158+
emptyList()
159+
}
160+
})
151161
}
152162

153163
onlyIf {

0 commit comments

Comments
 (0)