azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Distribution task depends on processed resources

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-13 14:07:57 +03:00
parent 9c89859c67
commit 14387332d5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
+4 -1
View File
@@ -138,6 +138,10 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
DISTRIBUTION_TASK_NAME DISTRIBUTION_TASK_NAME
) )
) { ) {
it.dependsOn(
target.project.tasks.getByName(compilation.processResourcesTaskName)
)
it.from(compilation.output.resourcesDir) it.from(compilation.output.resourcesDir)
it.into(distribution.directory ?: baseDist) it.into(distribution.directory ?: baseDist)
} }
@@ -160,7 +164,6 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
compilation.productionLinkTask, compilation.productionLinkTask,
compilation.developmentLinkTask compilation.developmentLinkTask
), ),
target.project.tasks.getByName(compilation.processResourcesTaskName),
distributionTask distributionTask
) )