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

[Gradle, JS] Root package json must run after all package json

Browse Source 
#KT-34832 fixed
This commit is contained in:
Ilya Goncharov
2020-04-17 16:41:02 +03:00
parent b0efd1d7ce
commit bded8443f1
1 changed files with 7 additions and 4 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/yarn/YarnPlugin.kt
+7 -4
View File
@@ -10,6 +10,7 @@ import org.gradle.api.Project
import org.gradle.api.plugins.BasePlugin
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinPackageJsonTask
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask
import org.jetbrains.kotlin.gradle.tasks.CleanDataTask
@@ -29,11 +30,13 @@ open class YarnPlugin : Plugin<Project> {
val rootClean = project.rootProject.tasks.named(BasePlugin.CLEAN_TASK_NAME)
val rootPackageJson = tasks.register(RootPackageJsonTask.NAME, RootPackageJsonTask::class.java) {
it.group = NodeJsRootPlugin.TASKS_GROUP_NAME
it.description = "Create root package.json"
val rootPackageJson = tasks.register(RootPackageJsonTask.NAME, RootPackageJsonTask::class.java) { task ->
task.group = NodeJsRootPlugin.TASKS_GROUP_NAME
task.description = "Create root package.json"
it.mustRunAfter(rootClean)
task.mustRunAfter(rootClean)
task.mustRunAfter(tasks.withType(KotlinPackageJsonTask::class.java))
}
tasks.named(KotlinNpmInstallTask.NAME).configure {