diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt index e56aaf98123..a682d4ddc20 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt @@ -39,8 +39,6 @@ open class NodeJsRootPlugin : Plugin { } } - val rootClean = project.rootProject.tasks.named(BasePlugin.CLEAN_TASK_NAME) - val setupFileHasherTask = registerTask(KotlinNpmCachesSetup.NAME) { it.description = "Setup file hasher for caches" } @@ -50,8 +48,6 @@ open class NodeJsRootPlugin : Plugin { it.dependsOn(setupFileHasherTask) it.group = TASKS_GROUP_NAME it.description = "Find, download and link NPM dependencies and projects" - - it.mustRunAfter(rootClean) } registerTask(PACKAGE_JSON_UMBRELLA_TASK_NAME) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt index bd160c6a4d3..0701b5ada98 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.gradle.targets.js.npm.tasks import org.gradle.api.DefaultTask -import org.gradle.api.plugins.BasePlugin import org.gradle.api.provider.Property import org.gradle.api.tasks.* import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation @@ -18,7 +17,6 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.npm.resolver.MayBeUpToDatePackageJsonTasksRegistry import org.jetbrains.kotlin.gradle.targets.js.npm.resolver.KotlinCompilationNpmResolver import org.jetbrains.kotlin.gradle.targets.js.npm.resolver.PACKAGE_JSON_UMBRELLA_TASK_NAME -import org.jetbrains.kotlin.gradle.tasks.dependsOn import org.jetbrains.kotlin.gradle.tasks.registerTask import org.jetbrains.kotlin.gradle.utils.getValue import java.io.File @@ -107,7 +105,6 @@ abstract class KotlinPackageJsonTask : DefaultTask() { val npmProject = compilation.npmProject val nodeJs = NodeJsRootPlugin.apply(project.rootProject) - val rootClean = project.rootProject.tasks.named(BasePlugin.CLEAN_TASK_NAME) val npmCachesSetupTask = nodeJs.npmCachesSetupTaskProvider val packageJsonTaskName = npmProject.packageJsonTaskName val packageJsonUmbrella = nodeJs.packageJsonUmbrellaTaskProvider @@ -123,7 +120,6 @@ abstract class KotlinPackageJsonTask : DefaultTask() { task.dependsOn(target.project.provider { task.findDependentTasks() }) task.dependsOn(npmCachesSetupTask) - task.mustRunAfter(rootClean) } packageJsonUmbrella.configure { task -> task.inputs.file(packageJsonTask.map { it.packageJson }) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt index 4501ec47a3a..8752f1363f3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.gradle.targets.js.yarn import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.api.plugins.BasePlugin import org.gradle.api.tasks.TaskProvider import org.jetbrains.kotlin.gradle.targets.js.MultiplePluginDeclarationDetector import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin @@ -41,14 +40,10 @@ open class YarnPlugin : Plugin { } } - val rootClean = project.rootProject.tasks.named(BasePlugin.CLEAN_TASK_NAME) - val rootPackageJson = tasks.register(RootPackageJsonTask.NAME, RootPackageJsonTask::class.java) { task -> task.dependsOn(nodeJs.npmCachesSetupTaskProvider) task.group = NodeJsRootPlugin.TASKS_GROUP_NAME task.description = "Create root package.json" - - task.mustRunAfter(rootClean) } configureRequiresNpmDependencies(project, rootPackageJson)