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

[Gradle, JS] KT-36784 Add composite dependencies to hook

Browse Source 
#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
This commit is contained in:
Ilya Goncharov
2020-03-27 16:14:35 +03:00
parent d3cb31c584
commit 1ef37b6203
3 changed files with 9 additions and 6 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/dukat/DukatCompilationResolverPlugin.kt
+4 -3
View File
@@ -36,9 +36,10 @@ internal class DukatCompilationResolverPlugin(
} }
override fun hookDependencies( override fun hookDependencies(
internalDependencies: MutableSet<KotlinCompilationNpmResolver>, internalDependencies: Set<KotlinCompilationNpmResolver>,
externalGradleDependencies: MutableSet<KotlinCompilationNpmResolver.ExternalGradleDependency>, internalCompositeDependencies: Set<KotlinCompilationNpmResolver.CompositeDependency>,
externalNpmDependencies: MutableSet<NpmDependency> externalGradleDependencies: Set<KotlinCompilationNpmResolver.ExternalGradleDependency>,
externalNpmDependencies: Set<NpmDependency>
) { ) {
if (nodeJs.experimental.discoverTypes) { if (nodeJs.experimental.discoverTypes) {
// todo: discoverTypes // todo: discoverTypes
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/plugins/CompilationResolverPlugin.kt
+4 -3
View File
@@ -10,8 +10,9 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.resolver.KotlinCompilationNpmR
internal interface CompilationResolverPlugin { internal interface CompilationResolverPlugin {
fun hookDependencies( fun hookDependencies(
internalDependencies: MutableSet<KotlinCompilationNpmResolver>, internalDependencies: Set<KotlinCompilationNpmResolver>,
externalGradleDependencies: MutableSet<KotlinCompilationNpmResolver.ExternalGradleDependency>, internalCompositeDependencies: Set<KotlinCompilationNpmResolver.CompositeDependency>,
externalNpmDependencies: MutableSet<NpmDependency> externalGradleDependencies: Set<KotlinCompilationNpmResolver.ExternalGradleDependency>,
externalNpmDependencies: Set<NpmDependency>
) )
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
+1
View File
@@ -172,6 +172,7 @@ internal class KotlinCompilationNpmResolver(
plugins.forEach { plugins.forEach {
it.hookDependencies( it.hookDependencies(
internalDependencies, internalDependencies,
internalCompositeDependencies,
externalGradleDependencies, externalGradleDependencies,
externalNpmDependencies externalNpmDependencies
) )