From 08cf78fafd9db6d7fa35b47940ee78786b7ac054 Mon Sep 17 00:00:00 2001 From: Aleksandr Liublinskii Date: Fri, 19 Feb 2021 14:16:34 +0100 Subject: [PATCH] MI-141 Fix 'Empty Library' entry in module dependencies --- .../targets/android/internal/AndroidDependencyResolver.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidDependencyResolver.kt index 6d2f47df3a4..d4cfcf4c1ea 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidDependencyResolver.kt @@ -117,7 +117,10 @@ object AndroidDependencyResolver { return sourceSet2Impl.mapValues { entry -> val dependencies = findDependencies(allImplConfigs, entry.value.implConfig) - val selfResolved = dependencies.filterIsInstance().map { AndroidDependency(collection = it.resolve()) } + val selfResolved = dependencies.filterIsInstance().map { dependency -> + val collection = dependency.resolve().takeIf(Collection::isNotEmpty) + AndroidDependency(dependency.name, group = dependency.group, collection = collection) + } val resolvedExternal = dependencies.filterIsInstance() .flatMap { collectDependencies(it.module, entry.value.compileConfig) }