From 4caa3ad56217c95001528a63ad2d62ec4b8a691d Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 27 Oct 2021 18:00:02 +0300 Subject: [PATCH] [Gradle, JS] Configure tasks in after evaluate block ^KT-34014 fixed ^KT-49505 fixed --- .../kotlin/gradle/targets/js/yarn/YarnPlugin.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt index e32b472ab6d..5f65a1391a2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt @@ -8,6 +8,7 @@ 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.jetbrains.kotlin.gradle.plugin.whenEvaluated import org.jetbrains.kotlin.gradle.targets.js.MultiplePluginDeclarationDetector import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies @@ -66,7 +67,16 @@ open class YarnPlugin : Plugin { project.allprojects .forEach { - it.tasks.implementing(RequiresNpmDependencies::class).all {} + val fn: (Project) -> Unit = { + it.tasks.implementing(RequiresNpmDependencies::class).all {} + } + if (it.state.executed) { + fn(it) + } else { + it.afterEvaluate { + fn(it) + } + } } val storeYarnLock = tasks.register("kotlinStoreYarnLock") {