[Gradle, JS] KT-36784 Add internalCompositeDependencies as inputs

#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
This commit is contained in:
Ilya Goncharov
2020-03-27 15:49:50 +03:00
parent 1c04ac71e9
commit d3cb31c584
@@ -53,7 +53,7 @@ internal class KotlinCompilationNpmResolver(
override fun toString(): String = "KotlinCompilationNpmResolver(${npmProject.name})" override fun toString(): String = "KotlinCompilationNpmResolver(${npmProject.name})"
val aggregatedConfiguration: Configuration by lazy { private val aggregatedConfiguration: Configuration by lazy {
createAggregatedConfiguration() createAggregatedConfiguration()
} }
@@ -247,6 +247,9 @@ internal class KotlinCompilationNpmResolver(
@get:Input @get:Input
val internalDependencies: Collection<String>, val internalDependencies: Collection<String>,
@get:Input
val internalCompositeDependencies: Collection<String>,
@get:InputFiles @get:InputFiles
val externalGradleDependencies: Collection<File>, val externalGradleDependencies: Collection<File>,
@@ -264,6 +267,7 @@ internal class KotlinCompilationNpmResolver(
val inputs: PackageJsonProducerInputs val inputs: PackageJsonProducerInputs
get() = PackageJsonProducerInputs( get() = PackageJsonProducerInputs(
internalDependencies.map { it.npmProject.name }, internalDependencies.map { it.npmProject.name },
internalCompositeDependencies.map { it.includedBuild.projectDir.canonicalPath },
externalGradleDependencies.map { it.artifact.file }, externalGradleDependencies.map { it.artifact.file },
externalNpmDependencies.map { "${it.scope} ${it.key}:${it.version}" } externalNpmDependencies.map { "${it.scope} ${it.key}:${it.version}" }
) )