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

MPP: Force COMMON platform for commonMain/commonTest source sets

Browse Source 
Follow-up for 172/AS3.1 bunches
This commit is contained in:
Alexey Sedunov
2018-09-10 18:51:24 +03:00
parent 863c0051ce
commit a417630c24
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.173
+12
View File
@@ -297,6 +297,18 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
} }
} }
for (sourceSet in sourceSets) { for (sourceSet in sourceSets) {
val name = sourceSet.name
if (name == KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME) {
sourceSet.platform = KotlinPlatform.COMMON
sourceSet.isTestModule = false
continue
}
if (name == KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME) {
sourceSet.platform = KotlinPlatform.COMMON
sourceSet.isTestModule = true
continue
}
val compilations = sourceSetToCompilations[sourceSet] val compilations = sourceSetToCompilations[sourceSet]
if (compilations != null) { if (compilations != null) {
sourceSet.platform = compilations.map { it.platform }.distinct().singleOrNull() ?: KotlinPlatform.COMMON sourceSet.platform = compilations.map { it.platform }.distinct().singleOrNull() ?: KotlinPlatform.COMMON
idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.as31
+12
View File
@@ -297,6 +297,18 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
} }
} }
for (sourceSet in sourceSets) { for (sourceSet in sourceSets) {
val name = sourceSet.name
if (name == KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME) {
sourceSet.platform = KotlinPlatform.COMMON
sourceSet.isTestModule = false
continue
}
if (name == KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME) {
sourceSet.platform = KotlinPlatform.COMMON
sourceSet.isTestModule = true
continue
}
val compilations = sourceSetToCompilations[sourceSet] val compilations = sourceSetToCompilations[sourceSet]
if (compilations != null) { if (compilations != null) {
sourceSet.platform = compilations.map { it.platform }.distinct().singleOrNull() ?: KotlinPlatform.COMMON sourceSet.platform = compilations.map { it.platform }.distinct().singleOrNull() ?: KotlinPlatform.COMMON