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

Gradle, npm, imported packages: import multiple version to different dirs

Browse Source
This commit is contained in:
Sergey Rostov
2019-05-31 10:56:11 +03:00
parent e557a3c3f2
commit 42bcb81c08
2 changed files with 7 additions and 4 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/GradleNodeModuleBuilder.kt
+5 -2
View File
@@ -167,7 +167,7 @@ fun makeNodeModule(
packageJson: PackageJson,
files: (File) -> Unit
): PackageJson {
val dir = container.resolve(packageJson.name)
val dir = importedPackageDir(container, packageJson.name, packageJson.version)
if (dir.exists()) dir.deleteRecursively()
@@ -186,4 +186,7 @@ fun makeNodeModule(
}
return packageJson
}
}
fun importedPackageDir(container: File, name: String, version: String): File =
container.resolve(name).resolve(version)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModulesCache.kt
+2 -2
View File
@@ -22,7 +22,7 @@ internal class GradleNodeModulesCache(val project: Project) : AutoCloseable {
}
internal val dir = project.nodeJs.root.nodeModulesGradleCacheDir
private val cache = ProcessedFilesCache(project, dir, STATE_FILE_NAME, "6")
private val cache = ProcessedFilesCache(project, dir, STATE_FILE_NAME, "8")
private val visited = mutableSetOf<ResolvedDependency>()
fun collectDependenciesFromConfiguration(configuration: Configuration, result: NpmGradleDependencies) {
@@ -66,7 +66,7 @@ internal class GradleNodeModulesCache(val project: Project) : AutoCloseable {
if (key != null) {
val (name, version) = key.split(":")
result.externalModules.add(GradleNodeModule(name, version, dir.resolve(name)))
result.externalModules.add(GradleNodeModule(name, version, importedPackageDir(dir, name, version)))
}
}
}