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

[Gradle, JS] KT-36784 Remove hasNodeModulesDependentTasks

Browse Source 
#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
This commit is contained in:
Ilya Goncharov
2020-04-01 12:38:01 +03:00
parent 9806ac992e
commit fe40056abe
2 changed files with 6 additions and 20 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/resolver/KotlinProjectNpmResolver.kt
-11
View File
@@ -107,13 +107,6 @@ internal class KotlinProjectNpmResolver(
fun getTaskRequirements(compilation: KotlinJsCompilation): Collection<RequiresNpmDependencies> = fun getTaskRequirements(compilation: KotlinJsCompilation): Collection<RequiresNpmDependencies> =
byCompilation[compilation] ?: listOf() byCompilation[compilation] ?: listOf()
val hasNodeModulesDependentTasks: Boolean
get() = _hasNodeModulesDependentTasks
@Volatile
var _hasNodeModulesDependentTasks = false
private set
init { init {
projectNpmResolver.project.tasks.implementing(RequiresNpmDependencies::class).forEach { task -> projectNpmResolver.project.tasks.implementing(RequiresNpmDependencies::class).forEach { task ->
if (task.enabled) { if (task.enabled) {
@@ -125,10 +118,6 @@ internal class KotlinProjectNpmResolver(
} }
private fun addTaskRequirements(task: RequiresNpmDependencies) { private fun addTaskRequirements(task: RequiresNpmDependencies) {
if (!_hasNodeModulesDependentTasks && task.nodeModulesRequired) {
_hasNodeModulesDependentTasks = true
}
val requirements = task.requiredNpmDependencies.toList() val requirements = task.requiredNpmDependencies.toList()
byTask[task] = requirements byTask[task] = requirements
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt
+6 -9
View File
@@ -108,15 +108,12 @@ internal class KotlinRootNpmResolver internal constructor(
} }
val upToDate = forceUpToDate || upToDateChecks.all { it.upToDate } val upToDate = forceUpToDate || upToDateChecks.all { it.upToDate }
val hasNodeModulesDependentTasks = projectResolvers.values.any { it.taskRequirements.hasNodeModulesDependentTasks } nodeJs.packageManager.resolveRootProject(
if (hasNodeModulesDependentTasks) { rootProject,
nodeJs.packageManager.resolveRootProject( allNpmPackages,
rootProject, upToDate,
allNpmPackages, nodeJs.npmInstallTask.args
upToDate, )
*nodeJs.npmInstallTask.args.toTypedArray()
)
}
nodeJs.rootNodeModulesStateFile.writeText(System.currentTimeMillis().toString()) nodeJs.rootNodeModulesStateFile.writeText(System.currentTimeMillis().toString())