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

[Gradle] [MPP] Add further explicit check for orphan source sets

Browse Source 
^KT-46273 Verification Pending
This commit is contained in:
sebastian.sellmair
2021-09-23 13:59:32 +02:00
committed by Space
parent da361a030e
commit 70fde9700f
1 changed files with 5 additions and 2 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/internal/KotlinDependenciesManagement.kt
+5 -2
View File
@@ -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 // 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 { 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) if (stdlibModuleName != null && !moduleAddedInHierarchy)
@@ -280,7 +281,8 @@ internal fun configureKotlinTestDependency(project: Project) {
project.tryWithDependenciesIfUnresolved(configuration) { dependencies -> project.tryWithDependenciesIfUnresolved(configuration) { dependencies ->
val parentOrOwnVersions: List<String?> = val parentOrOwnVersions: List<String?> =
kotlinSourceSet.withAllDependsOnSourceSets().filter(versionOrNullBySourceSet::contains).map(versionOrNullBySourceSet::get) kotlinSourceSet.withAllDependsOnSourceSets().filter(versionOrNullBySourceSet::contains)
.map(versionOrNullBySourceSet::get)
finalizingDependencies = true finalizingDependencies = true
@@ -307,6 +309,7 @@ internal fun configureKotlinTestDependency(project: Project) {
private fun kotlinTestCapabilityForJvmSourceSet(project: Project, kotlinSourceSet: KotlinSourceSet): String? { private fun kotlinTestCapabilityForJvmSourceSet(project: Project, kotlinSourceSet: KotlinSourceSet): String? {
val compilations = CompilationSourceSetUtil.compilationsBySourceSets(project).getValue(kotlinSourceSet) val compilations = CompilationSourceSetUtil.compilationsBySourceSets(project).getValue(kotlinSourceSet)
.filter { it.target !is KotlinMetadataTarget } .filter { it.target !is KotlinMetadataTarget }
.ifEmpty { return null }
val platformTypes = compilations.map { it.platformType } val platformTypes = compilations.map { it.platformType }
// TODO: Extract jvmPlatformTypes to public constant? // TODO: Extract jvmPlatformTypes to public constant?