From 7258926db6914a0c284d17c9fb3ff5f35eaf0a87 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Mon, 5 Dec 2022 14:44:32 +0100 Subject: [PATCH] [Gradle] IdeCompositeDependencyResolver: Support WithBuildDependencies KT-55238 --- .../kotlin/gradle/plugin/ide/IdeDependencyResolver.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt index 2eb7048ed39..ac5442c09b3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt @@ -60,8 +60,14 @@ operator fun IdeDependencyResolver.plus(other: IdeDependencyResolver): IdeDepend private class IdeCompositeDependencyResolver( val children: List -) : IdeDependencyResolver { +) : IdeDependencyResolver, IdeDependencyResolver.WithBuildDependencies { override fun resolve(sourceSet: KotlinSourceSet): Set { return children.flatMap { child -> child.resolve(sourceSet) }.toSet() } + + override fun dependencies(project: Project): Iterable { + return children.flatMap { child -> + if (child is IdeDependencyResolver.WithBuildDependencies) child.dependencies(project) else emptyList() + } + } }