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

Minor: swap receiver and parameter for shouldCoerceToCommon

Browse Source 
Otherwise, it reads as if KotlinSourceSet coerces ImportingContext,
which is in fact the other way around
This commit is contained in:
Dmitry Savvinov
2021-01-13 11:33:02 +03:00
committed by Yaroslav Chernyshev
parent 7ddcdca6bb
commit ef04ae041e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt
+6 -6
View File
@@ -745,19 +745,19 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
sourceSet.actualPlatforms.addSimplePlatforms(platforms) sourceSet.actualPlatforms.addSimplePlatforms(platforms)
} }
if (sourceSet.shouldCoerceToCommon(importingContext)) { if (importingContext.shouldCoerceToCommon(sourceSet)) {
sourceSet.actualPlatforms.addSimplePlatforms(listOf(KotlinPlatform.COMMON)) sourceSet.actualPlatforms.addSimplePlatforms(listOf(KotlinPlatform.COMMON))
} }
} }
} }
private fun KotlinSourceSetImpl.shouldCoerceToCommon(importingContext: MultiplatformModelImportingContext): Boolean { private fun MultiplatformModelImportingContext.shouldCoerceToCommon(sourceSet: KotlinSourceSetImpl): Boolean {
val isHMPPEnabled = importingContext.getProperty(IS_HMPP_ENABLED) val isHMPPEnabled = getProperty(IS_HMPP_ENABLED)
val coerceRootSourceSetsToCommon = importingContext.getProperty(COERCE_ROOT_SOURCE_SETS_TO_COMMON) val coerceRootSourceSetsToCommon = getProperty(COERCE_ROOT_SOURCE_SETS_TO_COMMON)
val isRoot = name == COMMON_MAIN_SOURCE_SET_NAME || name == COMMON_TEST_SOURCE_SET_NAME val isRoot = sourceSet.name == COMMON_MAIN_SOURCE_SET_NAME || sourceSet.name == COMMON_TEST_SOURCE_SET_NAME
// never makes sense to coerce single-targeted source-sets // never makes sense to coerce single-targeted source-sets
if (actualPlatforms.platforms.size == 1) return false if (sourceSet.actualPlatforms.platforms.size == 1) return false
return when { return when {
// pre-HMPP has only single-targeted source sets and COMMON // pre-HMPP has only single-targeted source sets and COMMON