From d8a31541ed9264ba7787b6ba307a330ac7e99c3a Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Wed, 2 Oct 2024 11:39:16 +0200 Subject: [PATCH] [Swift Export] Use package visibility for `init(__externalRCRef:)` Every class generated by Swift Export from Kotlin Class has such an initializer. It is part of the internal machinery and not supposed to be invoked by users. This commit switches these initializers to `package` visibility, thus limiting user access but keeping inter-module access for multimodular Swift Export output. ^KT-71951 Fixed --- .../nodes/SirClassFromKtSymbol.kt | 1 + .../any/golden_result/main/main.swift | 2 +- .../cross_module_inheritance.swift | 2 +- .../inheritance/inheritance.swift | 6 +-- .../classes/golden_result/main/main.swift | 50 +++++++++---------- .../dependency_deeper_neighbor_exported.swift | 2 +- .../golden_result/dep/dep.swift | 2 +- .../golden_result/flattened/flattened.swift | 2 +- .../golden_result/main/main.swift | 12 ++--- .../functions/golden_result/main/main.swift | 2 +- .../inheritance/golden_result/main/main.swift | 2 +- .../golden_result/main/main.swift | 2 +- .../golden_result/main/main.swift | 2 +- .../golden_result/main/main.swift | 4 +- .../golden_result/overrides/overrides.swift | 6 +-- .../overrides_across_modules.swift | 2 +- .../golden_result/main/main.swift | 2 +- .../golden_result/main/main.swift | 2 +- .../golden_result/main/main.swift | 2 +- .../golden_result/main/main.swift | 2 +- .../golden_result/main/main.swift | 34 ++++++------- .../typealiases/golden_result/main/main.swift | 12 ++--- .../golden_result/main/main.swift | 4 +- 23 files changed, 79 insertions(+), 78 deletions(-) diff --git a/native/swift/sir-light-classes/src/org/jetbrains/sir/lightclasses/nodes/SirClassFromKtSymbol.kt b/native/swift/sir-light-classes/src/org/jetbrains/sir/lightclasses/nodes/SirClassFromKtSymbol.kt index 137611b952712..091b8d11a4584 100644 --- a/native/swift/sir-light-classes/src/org/jetbrains/sir/lightclasses/nodes/SirClassFromKtSymbol.kt +++ b/native/swift/sir-light-classes/src/org/jetbrains/sir/lightclasses/nodes/SirClassFromKtSymbol.kt @@ -89,6 +89,7 @@ internal class SirClassFromKtSymbol( private fun kotlinBaseInitDeclaration(): SirDeclaration = buildInit { origin = SirOrigin.KotlinBaseInitOverride(`for` = KotlinSource(ktSymbol)) + visibility = SirVisibility.PACKAGE // Hide from users, but not from other Swift Export modules. isFailable = false isOverride = true parameters.add( diff --git a/native/swift/swift-export-standalone/testData/generation/any/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/any/golden_result/main/main.swift index 1efa07883ac4c..df7bda461d27b 100644 --- a/native/swift/swift-export-standalone/testData/generation/any/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/any/golden_result/main/main.swift @@ -10,7 +10,7 @@ public final class MyObject : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/classes/golden_result/cross_module_inheritance/cross_module_inheritance.swift b/native/swift/swift-export-standalone/testData/generation/classes/golden_result/cross_module_inheritance/cross_module_inheritance.swift index d6a3f8b5170a5..3193f67a3cb4b 100644 --- a/native/swift/swift-export-standalone/testData/generation/classes/golden_result/cross_module_inheritance/cross_module_inheritance.swift +++ b/native/swift/swift-export-standalone/testData/generation/classes/golden_result/cross_module_inheritance/cross_module_inheritance.swift @@ -10,7 +10,7 @@ public final class CLASS_ACROSS_MODULES : inheritance.OPEN_CLASS { return CLASS_ACROSS_MODULES_value_set__TypesOfArguments__Swift_Int32__(self.__externalRCRef(), newValue) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/classes/golden_result/inheritance/inheritance.swift b/native/swift/swift-export-standalone/testData/generation/classes/golden_result/inheritance/inheritance.swift index c495215e0653c..71231d40553b0 100644 --- a/native/swift/swift-export-standalone/testData/generation/classes/golden_result/inheritance/inheritance.swift +++ b/native/swift/swift-export-standalone/testData/generation/classes/golden_result/inheritance/inheritance.swift @@ -10,7 +10,7 @@ public final class INHERITANCE_SINGLE_CLASS : inheritance.OPEN_CLASS { return INHERITANCE_SINGLE_CLASS_value_set__TypesOfArguments__Swift_Int32__(self.__externalRCRef(), newValue) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -32,7 +32,7 @@ public final class OBJECT_WITH_CLASS_INHERITANCE : inheritance.OPEN_CLASS { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -44,7 +44,7 @@ open class OPEN_CLASS : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___OPEN_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/classes/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/classes/golden_result/main/main.swift index e20da5526b877..04cf88683439f 100644 --- a/native/swift/swift-export-standalone/testData/generation/classes/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/classes/golden_result/main/main.swift @@ -8,7 +8,7 @@ public final class CLASS_WITH_SAME_NAME : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___CLASS_WITH_SAME_NAME_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -23,7 +23,7 @@ public final class ClassWithNonPublicConstructor : KotlinRuntime.KotlinBase { return ClassWithNonPublicConstructor_a_get(self.__externalRCRef()) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -52,7 +52,7 @@ public final class Foo : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -80,7 +80,7 @@ public final class Foo : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) Foo_INSIDE_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -102,7 +102,7 @@ public final class Foo : KotlinRuntime.KotlinBase { return Foo_my_variable_set__TypesOfArguments__Swift_Int64__(self.__externalRCRef(), newValue) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -133,7 +133,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) OBJECT_NO_PACKAGE_Bar_CLASS_INSIDE_CLASS_INSIDE_OBJECT_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -148,7 +148,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -162,7 +162,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase { return OBJECT_NO_PACKAGE_Bar_i_get(self.__externalRCRef()) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -184,7 +184,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) OBJECT_NO_PACKAGE_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -199,7 +199,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -226,7 +226,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -258,7 +258,7 @@ public extension ExportedKotlinPackages.namespace.deeper { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -294,7 +294,7 @@ public extension ExportedKotlinPackages.namespace.deeper { super.init(__externalRCRef: __kt) namespace_deeper_Foo_INSIDE_CLASS_DEEPER_INSIDE_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -321,7 +321,7 @@ public extension ExportedKotlinPackages.namespace.deeper { super.init(__externalRCRef: __kt) namespace_deeper_Foo_INSIDE_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -348,7 +348,7 @@ public extension ExportedKotlinPackages.namespace.deeper { super.init(__externalRCRef: __kt) namespace_deeper_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -363,7 +363,7 @@ public extension ExportedKotlinPackages.namespace.deeper { super.init(__externalRCRef: __kt) namespace_deeper_NAMESPACED_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -380,7 +380,7 @@ public extension ExportedKotlinPackages.namespace.deeper { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -391,7 +391,7 @@ public extension ExportedKotlinPackages.namespace.deeper { return namespace_deeper_OBJECT_WITH_PACKAGE_Bar_i_get(self.__externalRCRef()) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -413,7 +413,7 @@ public extension ExportedKotlinPackages.namespace.deeper { super.init(__externalRCRef: __kt) namespace_deeper_OBJECT_WITH_PACKAGE_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -428,7 +428,7 @@ public extension ExportedKotlinPackages.namespace.deeper { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -455,7 +455,7 @@ public extension ExportedKotlinPackages.namespace.deeper { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -473,7 +473,7 @@ public extension ExportedKotlinPackages.namespace { super.init(__externalRCRef: __kt) namespace_Foo_INSIDE_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -497,7 +497,7 @@ public extension ExportedKotlinPackages.namespace { super.init(__externalRCRef: __kt) namespace_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -512,7 +512,7 @@ public extension ExportedKotlinPackages.namespace { super.init(__externalRCRef: __kt) namespace_NAMESPACED_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -526,7 +526,7 @@ public extension ExportedKotlinPackages.why_we_need_module_names { super.init(__externalRCRef: __kt) why_we_need_module_names_CLASS_WITH_SAME_NAME_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/consuming_dependencies/golden_result/dependency_deeper_neighbor_exported/dependency_deeper_neighbor_exported.swift b/native/swift/swift-export-standalone/testData/generation/consuming_dependencies/golden_result/dependency_deeper_neighbor_exported/dependency_deeper_neighbor_exported.swift index 80230f77ce21b..6953161727679 100644 --- a/native/swift/swift-export-standalone/testData/generation/consuming_dependencies/golden_result/dependency_deeper_neighbor_exported/dependency_deeper_neighbor_exported.swift +++ b/native/swift/swift-export-standalone/testData/generation/consuming_dependencies/golden_result/dependency_deeper_neighbor_exported/dependency_deeper_neighbor_exported.swift @@ -9,7 +9,7 @@ public extension ExportedKotlinPackages.dependency.four { super.init(__externalRCRef: __kt) dependency_four_AnotherBar_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/dep/dep.swift b/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/dep/dep.swift index 11a3248eddb06..78fcf3131958b 100644 --- a/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/dep/dep.swift +++ b/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/dep/dep.swift @@ -9,7 +9,7 @@ public extension ExportedKotlinPackages.test.factory.modules { super.init(__externalRCRef: __kt) test_factory_modules_ClassFromDependency_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/flattened/flattened.swift b/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/flattened/flattened.swift index 2174e6cfd56b1..4b43c82cf1c28 100644 --- a/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/flattened/flattened.swift +++ b/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/flattened/flattened.swift @@ -15,7 +15,7 @@ public extension ExportedKotlinPackages.flattenedPackage { super.init(__externalRCRef: __kt) flattenedPackage_FlattenedPackageClass_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/main/main.swift index 40fd968653267..66ed421ce22f8 100644 --- a/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/functionAndClassWithSameName/golden_result/main/main.swift @@ -10,7 +10,7 @@ public final class ClassWithFactoryWithoutParameters : KotlinRuntime.KotlinBase return ClassWithFactoryWithoutParameters_value_get(self.__externalRCRef()) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -32,7 +32,7 @@ public final class ObjectWithFactory : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -44,7 +44,7 @@ public final class UtcOffset : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___UtcOffset_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -91,7 +91,7 @@ public extension ExportedKotlinPackages.test.factory { super.init(__externalRCRef: __kt) test_factory_ClassWithFactoryInAPackage_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -104,7 +104,7 @@ public extension ExportedKotlinPackages.test.factory { super.init(__externalRCRef: __kt) test_factory_Outer_Nested_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -115,7 +115,7 @@ public extension ExportedKotlinPackages.test.factory { super.init(__externalRCRef: __kt) test_factory_Outer_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/functions/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/functions/golden_result/main/main.swift index 07e438dfa497b..7e694bf5ff9d4 100644 --- a/native/swift/swift-export-standalone/testData/generation/functions/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/functions/golden_result/main/main.swift @@ -55,7 +55,7 @@ public extension ExportedKotlinPackages.overload { super.init(__externalRCRef: __kt) overload_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/inheritance/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/inheritance/golden_result/main/main.swift index 8c051cdd2db47..fb6ffbfb53ab4 100644 --- a/native/swift/swift-export-standalone/testData/generation/inheritance/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/inheritance/golden_result/main/main.swift @@ -7,7 +7,7 @@ open class Foo : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/inner_classes/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/inner_classes/golden_result/main/main.swift index f9e174bc29aa2..b293ee52a476f 100644 --- a/native/swift/swift-export-standalone/testData/generation/inner_classes/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/inner_classes/golden_result/main/main.swift @@ -7,7 +7,7 @@ public final class Outer : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___Outer_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/nothing_type/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/nothing_type/golden_result/main/main.swift index eb36abebc1761..014dab326686e 100644 --- a/native/swift/swift-export-standalone/testData/generation/nothing_type/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/nothing_type/golden_result/main/main.swift @@ -9,7 +9,7 @@ public final class Bar : KotlinRuntime.KotlinBase { return Bar_p_get(self.__externalRCRef()) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/nullable_type/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/nullable_type/golden_result/main/main.swift index 0c457e3dc52cd..c8c70718fec74 100644 --- a/native/swift/swift-export-standalone/testData/generation/nullable_type/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/nullable_type/golden_result/main/main.swift @@ -11,7 +11,7 @@ public final class Bar : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___Bar_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -36,7 +36,7 @@ public final class Foo : KotlinRuntime.KotlinBase { return Foo_variable_set__TypesOfArguments__main_Bar_opt___(self.__externalRCRef(), newValue.map { it in it.__externalRCRef() } ?? 0) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/overrides/golden_result/overrides/overrides.swift b/native/swift/swift-export-standalone/testData/generation/overrides/golden_result/overrides/overrides.swift index dc113c5305511..869bc112bd2d1 100644 --- a/native/swift/swift-export-standalone/testData/generation/overrides/golden_result/overrides/overrides.swift +++ b/native/swift/swift-export-standalone/testData/generation/overrides/golden_result/overrides/overrides.swift @@ -32,7 +32,7 @@ open class Child : overrides.Parent { return Child_subtypeOptionalPrimitiveVar_get(self.__externalRCRef()) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -107,7 +107,7 @@ open class Child : overrides.Parent { } } public final class GrandChild : overrides.Child { - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -165,7 +165,7 @@ open class Parent : KotlinRuntime.KotlinBase { return Parent_value_get(self.__externalRCRef()) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/overrides/golden_result/overrides_across_modules/overrides_across_modules.swift b/native/swift/swift-export-standalone/testData/generation/overrides/golden_result/overrides_across_modules/overrides_across_modules.swift index a69d8f0d66e75..4752b254565a0 100644 --- a/native/swift/swift-export-standalone/testData/generation/overrides/golden_result/overrides_across_modules/overrides_across_modules.swift +++ b/native/swift/swift-export-standalone/testData/generation/overrides/golden_result/overrides_across_modules/overrides_across_modules.swift @@ -7,7 +7,7 @@ open class Cousin : overrides.Parent { return Cousin_primitiveTypeVar_get(self.__externalRCRef()) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/package_flattening/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/package_flattening/golden_result/main/main.swift index 0a1fcfa611ef5..0d470c9ebd889 100644 --- a/native/swift/swift-export-standalone/testData/generation/package_flattening/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/package_flattening/golden_result/main/main.swift @@ -37,7 +37,7 @@ public extension ExportedKotlinPackages.org.kotlin.foo { super.init(__externalRCRef: __kt) org_kotlin_foo_Clazz_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/package_flattening_invalid_target/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/package_flattening_invalid_target/golden_result/main/main.swift index 4b78d4b3e5ee6..1db6bb78c26ab 100644 --- a/native/swift/swift-export-standalone/testData/generation/package_flattening_invalid_target/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/package_flattening_invalid_target/golden_result/main/main.swift @@ -9,7 +9,7 @@ public extension ExportedKotlinPackages.org.kotlin { super.init(__externalRCRef: __kt) org_kotlin_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/package_flattening_missing_target/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/package_flattening_missing_target/golden_result/main/main.swift index 4b78d4b3e5ee6..1db6bb78c26ab 100644 --- a/native/swift/swift-export-standalone/testData/generation/package_flattening_missing_target/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/package_flattening_missing_target/golden_result/main/main.swift @@ -9,7 +9,7 @@ public extension ExportedKotlinPackages.org.kotlin { super.init(__externalRCRef: __kt) org_kotlin_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/single_module_production/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/single_module_production/golden_result/main/main.swift index 83ddd87c8a1cf..7916294d316af 100644 --- a/native/swift/swift-export-standalone/testData/generation/single_module_production/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/single_module_production/golden_result/main/main.swift @@ -36,7 +36,7 @@ public extension main.org.kotlin.foo { super.init(__externalRCRef: __kt) org_kotlin_foo_Clazz_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/type_reference/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/type_reference/golden_result/main/main.swift index 452bda1e45ecf..0b8974ddd6c49 100644 --- a/native/swift/swift-export-standalone/testData/generation/type_reference/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/type_reference/golden_result/main/main.swift @@ -9,7 +9,7 @@ public final class Class_without_package : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) Class_without_package_INNER_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -24,7 +24,7 @@ public final class Class_without_package : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -35,7 +35,7 @@ public final class Class_without_package : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___Class_without_package_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -48,7 +48,7 @@ public final class Demo : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) Demo_INNER_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -63,7 +63,7 @@ public final class Demo : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -121,7 +121,7 @@ public final class Demo : KotlinRuntime.KotlinBase { return Demo_var4_set__TypesOfArguments__ExportedKotlinPackages_namespace_deeper_Object_with_package__(self.__externalRCRef(), newValue.__externalRCRef()) } } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -167,7 +167,7 @@ open class OPEN_CLASS : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___OPEN_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -180,7 +180,7 @@ public final class Object_without_package : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) Object_without_package_INNER_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -195,7 +195,7 @@ public final class Object_without_package : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -209,7 +209,7 @@ public final class Object_without_package : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -363,7 +363,7 @@ public extension ExportedKotlinPackages.namespace.deeper { super.init(__externalRCRef: __kt) namespace_deeper_Class_with_package_INNER_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -378,7 +378,7 @@ public extension ExportedKotlinPackages.namespace.deeper { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -389,7 +389,7 @@ public extension ExportedKotlinPackages.namespace.deeper { super.init(__externalRCRef: __kt) namespace_deeper_Class_with_package_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -409,7 +409,7 @@ public extension ExportedKotlinPackages.namespace.deeper { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -428,7 +428,7 @@ public extension ExportedKotlinPackages.namespace.deeper { super.init(__externalRCRef: __kt) namespace_deeper_Object_with_package_INNER_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -443,7 +443,7 @@ public extension ExportedKotlinPackages.namespace.deeper { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -457,7 +457,7 @@ public extension ExportedKotlinPackages.namespace.deeper { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/typealiases/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/typealiases/golden_result/main/main.swift index a8308737d0bed..2adf2abf2a113 100644 --- a/native/swift/swift-export-standalone/testData/generation/typealiases/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/typealiases/golden_result/main/main.swift @@ -34,7 +34,7 @@ public final class DATA_OBJECT_WITH_PACKAGE : KotlinRuntime.KotlinBase { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -55,7 +55,7 @@ public final class INHERITANCE_SINGLE_CLASS : main.OPEN_CLASS { super.init(__externalRCRef: __kt) __root___INHERITANCE_SINGLE_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -70,7 +70,7 @@ public final class OBJECT_WITH_CLASS_INHERITANCE : main.OPEN_CLASS { private override init() { fatalError() } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -82,7 +82,7 @@ open class OPEN_CLASS : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___OPEN_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -102,7 +102,7 @@ public extension ExportedKotlinPackages.typealiases.inner { super.init(__externalRCRef: __kt) typealiases_inner_Bar_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -118,7 +118,7 @@ public extension ExportedKotlinPackages.typealiases { super.init(__externalRCRef: __kt) typealiases_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) diff --git a/native/swift/swift-export-standalone/testData/generation/unsupportedDeclarationsReporting/golden_result/main/main.swift b/native/swift/swift-export-standalone/testData/generation/unsupportedDeclarationsReporting/golden_result/main/main.swift index ae04297444a62..49d59a7746220 100644 --- a/native/swift/swift-export-standalone/testData/generation/unsupportedDeclarationsReporting/golden_result/main/main.swift +++ b/native/swift/swift-export-standalone/testData/generation/unsupportedDeclarationsReporting/golden_result/main/main.swift @@ -8,7 +8,7 @@ public final class Foo : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) Foo_Nested_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef) @@ -19,7 +19,7 @@ public final class Foo : KotlinRuntime.KotlinBase { super.init(__externalRCRef: __kt) __root___Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt) } - public override init( + package override init( __externalRCRef: Swift.UInt ) { super.init(__externalRCRef: __externalRCRef)