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

[Gradle, JS] Small refactoring of yarn imported

Browse Source 
^KT-39515 fixed
This commit is contained in:
Ilya Goncharov
2020-07-09 16:05:52 +03:00
parent cfd91023be
commit 8586d5e206
1 changed files with 12 additions and 13 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/yarn/YarnImportedPackagesVersionResolver.kt
+12 -13
View File
@@ -30,14 +30,19 @@ class YarnImportedPackagesVersionResolver(
} }
fun resolveAndUpdatePackages(): MutableList<String> { fun resolveAndUpdatePackages(): MutableList<String> {
resolveAndUpdate(externalModules, false) resolve(externalModules, false)
resolveAndUpdate(internalCompositeModules, true) resolve(internalCompositeModules, true)
return importedProjectWorkspaces
}
private fun resolveAndUpdate(modules: MutableSet<GradleNodeModule>, isWorkspace: Boolean) { if (resolvedVersion.isNotEmpty()) {
resolve(modules, isWorkspace) npmProjects.forEach {
updatePackages(modules) updatePackageJson(it.packageJson, it.npmProject.packageJsonFile)
}
updatePackages(externalModules)
updatePackages(internalCompositeModules)
}
return importedProjectWorkspaces
} }
private fun resolve(modules: MutableSet<GradleNodeModule>, isWorkspace: Boolean) { private fun resolve(modules: MutableSet<GradleNodeModule>, isWorkspace: Boolean) {
@@ -63,12 +68,6 @@ class YarnImportedPackagesVersionResolver(
} }
private fun updatePackages(modules: MutableSet<GradleNodeModule>) { private fun updatePackages(modules: MutableSet<GradleNodeModule>) {
if (resolvedVersion.isEmpty()) return
npmProjects.forEach {
updatePackageJson(it.packageJson, it.npmProject.packageJsonFile)
}
modules.forEach { modules.forEach {
val packageJsonFile = it.path.resolve(NpmProject.PACKAGE_JSON) val packageJsonFile = it.path.resolve(NpmProject.PACKAGE_JSON)
val packageJson = packageJsonFile.reader().use { val packageJson = packageJsonFile.reader().use {