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

[Gradle] [MPP] CInteropPropagatedDependencies: Consider associate compilations

Browse Source 
^KT-48856 Verification Pending
This commit is contained in:
sebastian.sellmair
2021-09-24 10:08:10 +02:00
committed by Space
parent e7d8804bdf
commit c51d37d65d
1 changed files with 5 additions and 3 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/native/internal/CInteropPropagatedDependencies.kt
+4 -2
View File
@@ -67,9 +67,11 @@ private fun Project.getPropagatedCInteropDependenciesOrEmpty(sourceSet: DefaultK
/* Participating in multiple compilations? -> can't propagate -> should be commonized */ /* Participating in multiple compilations? -> can't propagate -> should be commonized */
val compilation = compilations.singleOrNull() as? KotlinNativeCompilation ?: return@files emptySet<File>() val compilation = compilations.singleOrNull() as? KotlinNativeCompilation ?: return@files emptySet<File>()
(compilation.associateWith + compilation)
.filterIsInstance<KotlinNativeCompilation>()
/* Source Set is directly included in compilation -> No need to add dependency again (will be handled already) */ /* Source Set is directly included in compilation -> No need to add dependency again (will be handled already) */
if (sourceSet in compilation.kotlinSourceSets) return@files emptySet<File>() .filter { relevantCompilation -> sourceSet !in relevantCompilation.kotlinSourceSets }
getAllCInteropOutputFiles(compilation) .map { relevantCompilation -> getAllCInteropOutputFiles(relevantCompilation) }
} }
} }