From e87901cf417fcc3909436ad6fc7293c4f23e9f74 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Mon, 12 Feb 2018 14:39:46 +0300 Subject: [PATCH] Fix producing framework from multi-platform projects --- .../kotlin/backend/konan/objcexport/ObjCExportMapper.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt index b44b3a94753..86b04487d1b 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt @@ -55,13 +55,13 @@ internal fun ObjCExportMapper.getClassIfCategory(descriptor: CallableMemberDescr } internal fun ObjCExportMapper.shouldBeExposed(descriptor: CallableMemberDescriptor): Boolean = - descriptor.isEffectivelyPublicApi && !descriptor.isSuspend + descriptor.isEffectivelyPublicApi && !descriptor.isSuspend && !descriptor.isExpect internal fun ObjCExportMapper.shouldBeExposed(descriptor: ClassDescriptor): Boolean = descriptor.isEffectivelyPublicApi && !descriptor.defaultType.isObjCObjectType() && when (descriptor.kind) { ClassKind.CLASS, ClassKind.INTERFACE, ClassKind.ENUM_CLASS, ClassKind.OBJECT -> true ClassKind.ENUM_ENTRY, ClassKind.ANNOTATION_CLASS -> false - } && !isSpecialMapped(descriptor) + } && !descriptor.isExpect && !isSpecialMapped(descriptor) private fun ObjCExportMapper.isBase(descriptor: CallableMemberDescriptor): Boolean = descriptor.overriddenDescriptors.all { !shouldBeExposed(it) }