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

Gradle, js, npm: fix idea gradle sync for multiproject builds

Browse Source 
npm resolver ProjectData stored per project (not in root project)
This commit is contained in:
Sergey Rostov
2019-06-04 13:51:02 +03:00
parent b5080bda75
commit 465a47a194
1 changed files with 2 additions and 3 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/npm/NpmResolver.kt
+2 -3
View File
@@ -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!!)
}
}