| commit | 292f4f5889cf5802861afaa2f44ed772065c6dcb | [log] [tgz] |
|---|---|---|
| author | Anton Lakotka <anton.lakotka@jetbrains.com> | Thu Apr 14 22:08:01 2022 +0200 |
| committer | Anton Lakotka <anton.lakotka@jetbrains.com> | Fri Apr 15 06:35:12 2022 +0200 |
| tree | b62605a5dbceef83e96f9cf88da7a70ad5dc9ea3 | |
| parent | b45a0317074a0d36292df4a7b156eefead8338be [diff] |
[Gradle] Don't make commonMain as sharedNative when hmpp is disabled ^KT-51970
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt index 16751b4..9a92939 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
@@ -551,6 +551,9 @@ } internal fun isSharedNativeSourceSet(project: Project, sourceSet: KotlinSourceSet): Boolean { + if (!PropertiesProvider(project).hierarchicalStructureSupport && sourceSet.name == KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME) { + return false + } val compilations = compilationsBySourceSets(project)[sourceSet].orEmpty() return compilations.isNotEmpty() && compilations.all { it.platformType == KotlinPlatformType.common || it.platformType == KotlinPlatformType.native
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt index 6323540..4ca104c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
@@ -31,6 +31,10 @@ } kotlin.sourceSets.forEach { sourceSet -> + if (!PropertiesProvider(project).hierarchicalStructureSupport && sourceSet.name == KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME) { + return@forEach + } + val target = getCommonizerTarget(sourceSet) ?: return@forEach addDependencies(sourceSet, getNativeDistributionDependencies(target)) addDependencies(