diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt index c91d12ba0ac..93d0aeff574 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.KotlinDependencyScope import org.jetbrains.kotlin.gradle.plugin.sources.sourceSetDependencyConfigurationByScope import org.jetbrains.kotlin.gradle.targets.metadata.dependsOnClosureWithInterCompilationDependencies import org.jetbrains.kotlin.gradle.targets.metadata.getPublishedPlatformCompilations -import org.jetbrains.kotlin.gradle.targets.metadata.isSharedNativeSourceSet +import org.jetbrains.kotlin.gradle.targets.metadata.isNativeSourceSet import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropCommonizerCompositeMetadataJarBundling.cinteropMetadataDirectoryPath import org.jetbrains.kotlin.gradle.utils.getOrPut import org.w3c.dom.Document @@ -180,7 +180,7 @@ private fun buildKotlinProjectStructureMetadata(extension: KotlinMultiplatformEx * published as API dependencies of the metadata module to get into the resolution result, see * [KotlinMetadataTargetConfigurator.exportDependenciesForPublishing]. */ - val isNativeSharedSourceSet = isSharedNativeSourceSet(sourceSet) + val isNativeSharedSourceSet = isNativeSourceSet(sourceSet) val scopes = listOfNotNull( KotlinDependencyScope.API_SCOPE, KotlinDependencyScope.IMPLEMENTATION_SCOPE.takeIf { isNativeSharedSourceSet } @@ -197,7 +197,7 @@ private fun buildKotlinProjectStructureMetadata(extension: KotlinMultiplatformEx sourceSet.name to sourceSetExportedDependencies.map { ModuleIds.fromDependency(it) }.toSet() }, sourceSetCInteropMetadataDirectory = sourceSetsWithMetadataCompilations.keys - .filter { isSharedNativeSourceSet(it) } + .filter { isNativeSourceSet(it) } .associate { sourceSet -> sourceSet.name to cinteropMetadataDirectoryPath(sourceSet.name) }, hostSpecificSourceSets = getHostSpecificSourceSets(project) .filter { it in sourceSetsWithMetadataCompilations }.map { it.name } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt index 38a9d25932b..a8b3485eb0d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt @@ -300,7 +300,7 @@ class KotlinMetadataTargetConfigurator : val platformCompilations = sourceSet.internal.compilations .filter { it.target.name != KotlinMultiplatformPlugin.METADATA_TARGET_NAME } - val isNativeSourceSet = isSharedNativeSourceSet(sourceSet) + val isNativeSourceSet = isNativeSourceSet(sourceSet) val compilationFactory: KotlinCompilationFactory> = when { isNativeSourceSet -> KotlinSharedNativeCompilationFactory( @@ -568,7 +568,7 @@ internal fun createMetadataDependencyTransformationClasspath( ) } -internal fun isSharedNativeSourceSet(sourceSet: KotlinSourceSet): Boolean { +internal fun isNativeSourceSet(sourceSet: KotlinSourceSet): Boolean { val compilations = sourceSet.internal.compilations.filterNot { it.platformType == KotlinPlatformType.common } return compilations.isNotEmpty() && compilations.all { it.platformType == KotlinPlatformType.native } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt index 37ec9a23ff6..5cfb84b0547 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt @@ -177,7 +177,7 @@ internal fun getHostSpecificFragments( internal fun getHostSpecificSourceSets(project: Project): Set { return getHostSpecificElements( project.kotlinExtension.sourceSets, - isNativeShared = { sourceSet -> isSharedNativeSourceSet(sourceSet) }, + isNativeShared = { sourceSet -> isNativeSourceSet(sourceSet) }, getKonanTargets = { sourceSet -> sourceSet.internal.compilations .filterIsInstance()