From 70fde9700f31c0916542c5a94d3291d1e0bfc2ed Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Thu, 23 Sep 2021 13:59:32 +0200 Subject: [PATCH] [Gradle] [MPP] Add further explicit check for orphan source sets ^KT-46273 Verification Pending --- .../kotlin/gradle/internal/KotlinDependenciesManagement.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt index cd2b8d11426..035142e8303 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt @@ -196,7 +196,8 @@ private fun chooseAndAddStdlibDependency( // If the exact same module is added in the source sets hierarchy, possibly even with a different scope, we don't add it val moduleAddedInHierarchy = hierarchySourceSetsDependencyConfigurations.any { - it.allNonProjectDependencies().any { dependency -> dependency.group == KOTLIN_MODULE_GROUP && dependency.name == stdlibModuleName } + it.allNonProjectDependencies() + .any { dependency -> dependency.group == KOTLIN_MODULE_GROUP && dependency.name == stdlibModuleName } } if (stdlibModuleName != null && !moduleAddedInHierarchy) @@ -280,7 +281,8 @@ internal fun configureKotlinTestDependency(project: Project) { project.tryWithDependenciesIfUnresolved(configuration) { dependencies -> val parentOrOwnVersions: List = - kotlinSourceSet.withAllDependsOnSourceSets().filter(versionOrNullBySourceSet::contains).map(versionOrNullBySourceSet::get) + kotlinSourceSet.withAllDependsOnSourceSets().filter(versionOrNullBySourceSet::contains) + .map(versionOrNullBySourceSet::get) finalizingDependencies = true @@ -307,6 +309,7 @@ internal fun configureKotlinTestDependency(project: Project) { private fun kotlinTestCapabilityForJvmSourceSet(project: Project, kotlinSourceSet: KotlinSourceSet): String? { val compilations = CompilationSourceSetUtil.compilationsBySourceSets(project).getValue(kotlinSourceSet) .filter { it.target !is KotlinMetadataTarget } + .ifEmpty { return null } val platformTypes = compilations.map { it.platformType } // TODO: Extract jvmPlatformTypes to public constant?