Skip to content

Commit 6e31182

Browse files
authored
Merge pull request #1551 from ilgonmic/process-resources
Copying composeResources in processResources task instead of separate workaround task
2 parents ff70e4c + 8d51048 commit 6e31182

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

compose-web/build.gradle.kts

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.jetbrains.compose.ExperimentalComposeLibrary
2-
31
plugins {
42
kotlin("multiplatform")
53
id("kotlinx-serialization")
@@ -10,19 +8,6 @@ plugins {
108
group = "com.example"
119
version = "1.0-SNAPSHOT"
1210

13-
14-
val copyWasmResources = tasks.create("copyWasmResourcesWorkaround", Copy::class.java) {
15-
from(project(":shared").file("src/commonMain/composeResources"))
16-
into("build/processedResources/wasmJs/main")
17-
}
18-
19-
20-
afterEvaluate {
21-
project.tasks.getByName("wasmJsProcessResources").finalizedBy(copyWasmResources)
22-
project.tasks.getByName("wasmJsDevelopmentExecutableCompileSync").dependsOn(copyWasmResources)
23-
project.tasks.getByName("wasmJsProductionExecutableCompileSync").dependsOn(copyWasmResources)
24-
}
25-
2611
kotlin {
2712
wasmJs {
2813
moduleName = "confetti"
@@ -32,6 +17,10 @@ kotlin {
3217
}
3318
}
3419
binaries.executable()
20+
21+
tasks.named<ProcessResources>(compilations["main"].processResourcesTaskName) {
22+
from(project(":shared").file("src/commonMain/composeResources"))
23+
}
3524
}
3625

3726
sourceSets {

0 commit comments

Comments
 (0)