Skip to content

Commit 3098f6d

Browse files
committed
MPP: Improve JS gradle configs (use afterEvaluate)
1 parent a964799 commit 3098f6d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

gradle/dokka.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ if (platform == "jvm") {
5454
afterEvaluate {
5555
dependsOn(tasks.getByPath(":$project.name-js:classes"))
5656
dependsOn(tasks.getByPath(":$project.name-common:classes"))
57-
// dependsOn(tasks.getByPath(":js-stub:classes"))
5857
dependsOn(project.configurations.compileClasspath)
5958
classpath = project.configurations.compileClasspath.files
6059
}

gradle/test-js.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ tasks.withType(compileKotlin2Js.getClass()) {
1212

1313
task populateNodeModules(type: Copy, dependsOn: compileKotlin2Js) {
1414
from compileKotlin2Js.destinationDir
15+
into "${buildDir}/node_modules"
1516

16-
configurations.testCompile.each {
17-
from zipTree(it.absolutePath).matching {
18-
include '*.js'
19-
include '*.js.map'
17+
afterEvaluate {
18+
configurations.testCompile.each {
19+
from zipTree(it.absolutePath).matching {
20+
include '*.js'
21+
include '*.js.map'
22+
}
2023
}
2124
}
22-
23-
into "${buildDir}/node_modules"
2425
}
2526

2627
node {

0 commit comments

Comments
 (0)