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

MI-141 Fix 'Empty Library' entry in module dependencies

Browse Source
This commit is contained in:
Aleksandr Liublinskii
2021-02-19 14:16:34 +01:00
parent eec98314c8
commit 08cf78fafd
1 changed files with 4 additions and 1 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/android/internal/AndroidDependencyResolver.kt
+4 -1
View File
@@ -117,7 +117,10 @@ object AndroidDependencyResolver {
return sourceSet2Impl.mapValues { entry -> return sourceSet2Impl.mapValues { entry ->
val dependencies = findDependencies(allImplConfigs, entry.value.implConfig) val dependencies = findDependencies(allImplConfigs, entry.value.implConfig)
val selfResolved = dependencies.filterIsInstance<SelfResolvingDependency>().map { AndroidDependency(collection = it.resolve()) } val selfResolved = dependencies.filterIsInstance<SelfResolvingDependency>().map { dependency ->
val collection = dependency.resolve().takeIf(Collection<File?>::isNotEmpty)
AndroidDependency(dependency.name, group = dependency.group, collection = collection)
}
val resolvedExternal = dependencies.filterIsInstance<ExternalModuleDependency>() val resolvedExternal = dependencies.filterIsInstance<ExternalModuleDependency>()
.flatMap { collectDependencies(it.module, entry.value.compileConfig) } .flatMap { collectDependencies(it.module, entry.value.compileConfig) }