From 422ad763e47a36119b9443ed2a569b5b3ea61fe6 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 14 May 2019 15:25:16 +0300 Subject: [PATCH] Gradle, js: fix resolving required dependencies #KT-31011 --- .../kotlin/gradle/targets/js/npm/NpmProjectModules.kt | 2 ++ .../org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt | 3 +++ 2 files changed, 5 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProjectModules.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProjectModules.kt index dfb37969dcc..9bd30333768 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProjectModules.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProjectModules.kt @@ -80,6 +80,8 @@ internal open class NpmProjectModules( return null } + override fun toString(): String = "$dir" + companion object { const val JS_SUFFIX = ".js" const val INDEX_FILE_NAME = "index" diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt index 7f06bcef5c7..3343fef31e1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt @@ -225,6 +225,9 @@ internal class NpmResolver private constructor(val rootProject: Project) { if (requiredDependencies.isNotEmpty()) { val configuration = project.configurations.create("jsTools") + requiredDependencies.forEach { + configuration.dependencies.add(it) + } configuration.resolve() visitConfiguration(configuration, npmDependencies, gradleComponents) }