Skip to content

Commit f1134be

Browse files
committed
Include missing resources from modules
1 parent 2b224f3 commit f1134be

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package korlibs.korge.gradle.targets
2+
3+
import org.gradle.api.*
4+
import org.gradle.api.file.*
5+
import java.io.*
6+
7+
fun CopySpec.registerModulesResources(project: Project) {
8+
project.afterEvaluate {
9+
for (file in (project.rootDir.resolve("modules").listFiles()?.toList() ?: emptyList())) {
10+
from(File(file, "resources"))
11+
from(File(file, "src/commonMain/resources"))
12+
}
13+
}
14+
}

buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/ClosureCompiler.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package korlibs.korge.gradle.targets.js
22

3+
import korlibs.korge.gradle.targets.*
34
import korlibs.korge.gradle.util.*
45
import org.gradle.api.*
56
import org.gradle.api.tasks.Copy
@@ -19,6 +20,7 @@ fun Project.configureWebpack() {
1920
from(project.tasks.getByName("jsProcessResources").outputs.files)
2021
from(jsFile)
2122
from(mapFile)
23+
registerModulesResources(project)
2224
into(wwwFolder)
2325
}
2426
}

buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/js/Esbuild.kt

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package korlibs.korge.gradle.targets.js
22

33
import korlibs.korge.gradle.*
4+
import korlibs.korge.gradle.targets.*
45
import korlibs.korge.gradle.util.*
56
import org.gradle.api.*
67
import org.gradle.api.file.*
@@ -64,20 +65,9 @@ fun Project.configureErrorableEsbuild() {
6465

6566
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
6667
from(project.tasks.getByName("jsProcessResources").outputs.files)
67-
//afterEvaluate {
68-
// project.tasks.findByName(getKorgeProcessResourcesTaskName("js", "main"))?.outputs?.files?.let {
69-
// from(it)
70-
// }
71-
//}
72-
//for (sourceSet in gkotlin.js().compilations.flatMap { it.kotlinSourceSets }) from(sourceSet.resources)
68+
//from(kotlin.targets.getByName("js").compilations.main.defaultSourceSet.resources)
69+
registerModulesResources(project)
7370
into(wwwFolder)
74-
//afterEvaluate {
75-
// afterEvaluate {
76-
// val korgeGeneratedTask = project.tasks.findByName(korgeProcessResourcesTaskName) as? KorgeGenerateResourcesTask?
77-
// println("korgeGeneratedTaskName=$korgeGeneratedTask : korgeProcessResourcesTaskName=$korgeProcessResourcesTaskName")
78-
// korgeGeneratedTask?.addExcludeToCopyTask(this)
79-
// }
80-
//}
8171
}
8272

8373
val browserPrepareEsbuildPrepare = tasks.createThis<Task>("browserPrepareEsbuildPrepare") {

0 commit comments

Comments
 (0)