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

[Gradle, JS] Remove task oriented taskRequirements

Browse Source
This commit is contained in:
Ilya Goncharov
2020-06-09 13:23:24 +03:00
parent 8f679bf1d3
commit 49710c9509
1 changed files with 1 additions and 33 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
+1 -33
View File
@@ -15,8 +15,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies
import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinProjectNpmResolution
import kotlin.reflect.KClass
@@ -41,8 +39,6 @@ internal class KotlinProjectNpmResolver(
val compilationResolvers: Collection<KotlinCompilationNpmResolver>
get() = byCompilation.values
val taskRequirements by lazy { TasksRequirements(this) }
init {
addContainerListeners()
}
@@ -96,37 +92,9 @@ internal class KotlinProjectNpmResolver(
return KotlinProjectNpmResolution(
project,
byCompilation.values.mapNotNull { it.close() },
taskRequirements.byTask
resolver.nodeJs.taskRequirements.byTask
)
}
class TasksRequirements(val projectNpmResolver: KotlinProjectNpmResolver) {
val byTask = mutableMapOf<RequiresNpmDependencies, Collection<RequiredKotlinJsDependency>>()
val byCompilation = mutableMapOf<KotlinJsCompilation, MutableList<RequiresNpmDependencies>>()
fun getTaskRequirements(compilation: KotlinJsCompilation): Collection<RequiresNpmDependencies> =
byCompilation[compilation] ?: listOf()
init {
projectNpmResolver.project.tasks.implementing(RequiresNpmDependencies::class).configureEach { task ->
if (task.enabled) {
addTaskRequirements(task as RequiresNpmDependencies)
task.dependsOn(projectNpmResolver[task.compilation].packageJsonTaskHolder)
task.dependsOn(projectNpmResolver.resolver.nodeJs.npmInstallTask)
}
}
}
private fun addTaskRequirements(task: RequiresNpmDependencies) {
val requirements = task.requiredNpmDependencies.toList()
byTask[task] = requirements
byCompilation
.getOrPut(task.compilation) { mutableListOf() }
.add(task)
}
}
}
/**