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

[Gradle, JS] Fix Task Configuration Avoidance

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-27 11:45:02 +03:00
parent a2b774b186
commit ca150005a8
1 changed files with 3 additions and 3 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/subtargets/KotlinBrowserJs.kt
+3 -3
View File
@@ -94,7 +94,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
) { ) {
it.dependsOn( it.dependsOn(
nodeJs.npmInstallTask, nodeJs.npmInstallTask,
target.project.tasks.getByName(compilation.processResourcesTaskName) target.project.tasks.named(compilation.processResourcesTaskName)
) )
it.configureOptimization(kind) it.configureOptimization(kind)
@@ -153,7 +153,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
val baseDist = project.buildDir.resolve(basePluginConvention!!.distsDirName) val baseDist = project.buildDir.resolve(basePluginConvention!!.distsDirName)
distribution.directory = distribution.directory ?: baseDist distribution.directory = distribution.directory ?: baseDist
val processResourcesTask = target.project.tasks.getByName(compilation.processResourcesTaskName) val processResourcesTask = target.project.tasks.named(compilation.processResourcesTaskName)
val distributionTask = project.registerTask<Copy>( val distributionTask = project.registerTask<Copy>(
disambiguateCamelCased( disambiguateCamelCased(
@@ -161,7 +161,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
) )
) { ) {
it.dependsOn(processResourcesTask) it.dependsOn(processResourcesTask)
it.from(compilation.output.resourcesDir) it.from(compilation.output.resourcesDir)
it.into(distribution.directory ?: baseDist) it.into(distribution.directory ?: baseDist)
} }