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

[Gradle, JS] Add tools npm dependencies as input to package json task

Browse Source
This commit is contained in:
Ilya Goncharov
2020-06-09 16:24:51 +03:00
parent d0c0ddd7e5
commit 1a81f02377
1 changed files with 9 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/tasks/KotlinPackageJsonTask.kt
+9 -4
View File
@@ -7,10 +7,7 @@ package org.jetbrains.kotlin.gradle.targets.js.npm.tasks
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.plugins.BasePlugin import org.gradle.api.plugins.BasePlugin
import org.gradle.api.tasks.Nested import org.gradle.api.tasks.*
import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
@@ -37,6 +34,14 @@ open class KotlinPackageJsonTask : DefaultTask() {
dependency.includedBuild.task(":$PACKAGE_JSON_UMBRELLA_TASK_NAME") dependency.includedBuild.task(":$PACKAGE_JSON_UMBRELLA_TASK_NAME")
} }
@get:Input
internal val toolsNpmDependencies: List<String>
get() = nodeJs.taskRequirements
.getTaskRequirements(compilation)
.flatMap { it.requiredNpmDependencies }
.map { it.createDependency(project) }
.map { it.toString() }
@get:Nested @get:Nested
internal val producerInputs: KotlinCompilationNpmResolver.PackageJsonProducerInputs internal val producerInputs: KotlinCompilationNpmResolver.PackageJsonProducerInputs
get() = producer.inputs get() = producer.inputs