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

Gradle, js: fix requiredDependencies resolve

Browse Source
This commit is contained in:
Sergey Rostov
2019-05-14 11:14:01 +03:00
parent 1fe84c71e4
commit d08402a00c
1 changed files with 11 additions and 23 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
+11 -23
View File
@@ -9,7 +9,7 @@ import com.google.gson.Gson
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.Configuration
import org.gradle.api.execution.TaskExecutionGraph import org.gradle.api.artifacts.Dependency
import org.gradle.api.file.CopySpec import org.gradle.api.file.CopySpec
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension
@@ -87,13 +87,6 @@ internal class NpmResolver private constructor(val rootProject: Project) {
private val gson = GsonBuilder() private val gson = GsonBuilder()
.setPrettyPrinting() .setPrettyPrinting()
.create() .create()
private val readyTaskGraph: TaskExecutionGraph?
init {
var readyTaskGraph: TaskExecutionGraph? = null
rootProject.gradle.taskGraph.whenReady { readyTaskGraph = it }
this.readyTaskGraph = readyTaskGraph
}
class ProjectData(var resolved: ResolvedProject? = null) { class ProjectData(var resolved: ResolvedProject? = null) {
companion object { companion object {
@@ -217,28 +210,23 @@ internal class NpmResolver private constructor(val rootProject: Project) {
npmDependencies: MutableSet<NpmDependency>, npmDependencies: MutableSet<NpmDependency>,
gradleComponents: GradleNodeModulesBuilder gradleComponents: GradleNodeModulesBuilder
) { ) {
var toolsDependenciesConfiguration: Configuration? = project.configurations.create("jsTools") val requiredDependencies = mutableListOf<Dependency>()
project.tasks.toList().forEach { task -> project.tasks.toList().forEach { task ->
if (task is RequiresNpmDependencies) { if (task.enabled && task is RequiresNpmDependencies) {
if (readyTaskGraph?.hasTask(task) ?: task.enabled) { val list = task.requiredNpmDependencies.toList()
val list = task.requiredNpmDependencies.toList()
requiredByTasks[task] = list requiredByTasks[task] = list
list.forEach { requiredDependency -> list.forEach { requiredDependency ->
val configuration: Configuration = toolsDependenciesConfiguration requiredDependencies.add(requiredDependency.createDependency(project))
?: project.configurations.create("jsTools").also { new ->
toolsDependenciesConfiguration = new
}
configuration.dependencies.add(requiredDependency.createDependency(project))
}
} }
} }
} }
if (toolsDependenciesConfiguration != null) { if (requiredDependencies.isNotEmpty()) {
visitConfiguration(toolsDependenciesConfiguration!!, npmDependencies, gradleComponents) val configuration = project.configurations.create("jsTools")
configuration.resolve()
visitConfiguration(configuration, npmDependencies, gradleComponents)
} }
} }