From 465a47a194be4748593d22c8767b878405e7c45e Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 4 Jun 2019 13:51:02 +0300 Subject: [PATCH] Gradle, js, npm: fix idea gradle sync for multiproject builds npm resolver ProjectData stored per project (not in root project) --- .../jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt index 7434c9cfc0d..b02a7a36e6b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt @@ -24,8 +24,7 @@ import java.nio.file.Files internal class NpmResolver private constructor(val rootProject: Project) { companion object { fun resolveIfNeeded(project: Project): ResolutionCallResult { - val rootProject = project.rootProject - val process = ProjectData[rootProject] + val process = ProjectData[project] if (process != null && process.visit == null) return AlreadyInProgress @@ -33,7 +32,7 @@ internal class NpmResolver private constructor(val rootProject: Project) { return if (resolved != null) AlreadyResolved(resolved) else { - run(rootProject) + run(project.rootProject) ResolvedNow(ProjectData[project]!!.visit!!) } }