From 1ef37b6203446b5532fe97b50cf2f68035cb6ca5 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 27 Mar 2020 16:14:35 +0300
Subject: [PATCH] [Gradle, JS] KT-36784 Add composite dependencies to hook

#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
---
 .../targets/js/dukat/DukatCompilationResolverPlugin.kt     | 7 ++++---
 .../targets/js/npm/plugins/CompilationResolverPlugin.kt    | 7 ++++---
 .../js/npm/resolver/KotlinCompilationNpmResolver.kt        | 1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt
index 74f005f44a1..9be31feec43 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt
@@ -36,9 +36,10 @@ internal class DukatCompilationResolverPlugin(
     }
 
     override fun hookDependencies(
-        internalDependencies: MutableSet<KotlinCompilationNpmResolver>,
-        externalGradleDependencies: MutableSet<KotlinCompilationNpmResolver.ExternalGradleDependency>,
-        externalNpmDependencies: MutableSet<NpmDependency>
+        internalDependencies: Set<KotlinCompilationNpmResolver>,
+        internalCompositeDependencies: Set<KotlinCompilationNpmResolver.CompositeDependency>,
+        externalGradleDependencies: Set<KotlinCompilationNpmResolver.ExternalGradleDependency>,
+        externalNpmDependencies: Set<NpmDependency>
     ) {
         if (nodeJs.experimental.discoverTypes) {
             // todo: discoverTypes
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/plugins/CompilationResolverPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/plugins/CompilationResolverPlugin.kt
index de1f137fd4f..c9678fe127a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/plugins/CompilationResolverPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/plugins/CompilationResolverPlugin.kt
@@ -10,8 +10,9 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.resolver.KotlinCompilationNpmR
 
 internal interface CompilationResolverPlugin {
     fun hookDependencies(
-        internalDependencies: MutableSet<KotlinCompilationNpmResolver>,
-        externalGradleDependencies: MutableSet<KotlinCompilationNpmResolver.ExternalGradleDependency>,
-        externalNpmDependencies: MutableSet<NpmDependency>
+        internalDependencies: Set<KotlinCompilationNpmResolver>,
+        internalCompositeDependencies: Set<KotlinCompilationNpmResolver.CompositeDependency>,
+        externalGradleDependencies: Set<KotlinCompilationNpmResolver.ExternalGradleDependency>,
+        externalNpmDependencies: Set<NpmDependency>
     )
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
index 08889e03349..1207699cf24 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
@@ -172,6 +172,7 @@ internal class KotlinCompilationNpmResolver(
             plugins.forEach {
                 it.hookDependencies(
                     internalDependencies,
+                    internalCompositeDependencies,
                     externalGradleDependencies,
                     externalNpmDependencies
                 )