From 568ef5dc5f20abe702d0f7cbb1e0b961e58b306d Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 30 Mar 2020 16:06:34 +0300 Subject: [PATCH] [Gradle, JS] KT-36784 Fix depends on for package json umbrella #KT-32466 fixed #KT-36784 fixed #KT-36864 fixed --- .../gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt index 446d6979f65..fc604bc49d4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt @@ -60,6 +60,7 @@ open class KotlinPackageJsonTask : DefaultTask() { val rootClean = project.rootProject.tasks.getByName(BasePlugin.CLEAN_TASK_NAME) val npmInstallTask = nodeJs.npmInstallTask val packageJsonTaskName = npmProject.packageJsonTaskName + val packageJsonUmbrella = project.rootProject.tasks.named(PACKAGE_JSON_UMBRELLA_TASK_NAME) val packageJsonTask = project.registerTask(packageJsonTaskName) { task -> task.nodeJs = nodeJs task.compilation = compilation @@ -67,9 +68,11 @@ open class KotlinPackageJsonTask : DefaultTask() { task.group = NodeJsRootPlugin.TASKS_GROUP_NAME task.dependsOn(target.project.provider { task.findDependentTasks() }) - task.dependsOn(project.rootProject.tasks.named(PACKAGE_JSON_UMBRELLA_TASK_NAME)) task.mustRunAfter(rootClean) } + packageJsonUmbrella.configure { task -> + task.inputs.file(packageJsonTask.map { it.packageJson }) + } npmInstallTask.mustRunAfter(rootClean, packageJsonTask)