diff --git a/runtime/src/main/cpp/ObjCExport.h b/runtime/src/main/cpp/ObjCExport.h index 28c52d73238..d3281e66230 100644 --- a/runtime/src/main/cpp/ObjCExport.h +++ b/runtime/src/main/cpp/ObjCExport.h @@ -34,11 +34,6 @@ inline static OBJ_GETTER(AllocInstanceWithAssociatedObject, const TypeInfo* type extern "C" id Kotlin_ObjCExport_refToObjC(ObjHeader* obj); extern "C" OBJ_GETTER(Kotlin_ObjCExport_refFromObjC, id obj); -@protocol ConvertibleToKotlin -@required --(KRef)toKotlin:(KRef*)OBJ_RESULT; -@end; - extern "C" id Kotlin_Interop_CreateNSStringFromKString(KRef str); extern "C" OBJ_GETTER(Kotlin_Interop_CreateKStringFromNSString, NSString* str); diff --git a/runtime/src/main/cpp/ObjCExportPrivate.h b/runtime/src/main/cpp/ObjCExportPrivate.h index 37f9f1509bb..57aa89c6521 100644 --- a/runtime/src/main/cpp/ObjCExportPrivate.h +++ b/runtime/src/main/cpp/ObjCExportPrivate.h @@ -14,7 +14,7 @@ #import "Memory.h" #import "ObjCExport.h" -@interface KotlinBase : NSObject +@interface KotlinBase : NSObject +(instancetype)createWrapper:(ObjHeader*)obj; @end; diff --git a/runtime/src/objc/cpp/ObjCExportClasses.mm b/runtime/src/objc/cpp/ObjCExportClasses.mm index b754d51ec69..76dd5f7402b 100644 --- a/runtime/src/objc/cpp/ObjCExportClasses.mm +++ b/runtime/src/objc/cpp/ObjCExportClasses.mm @@ -130,7 +130,7 @@ extern "C" id objc_autoreleaseReturnValue(id self); @end; -@interface NSObject (NSObjectToKotlin) +@interface NSObject (NSObjectToKotlin) @end; static void checkLoadedOnce(); @@ -152,7 +152,7 @@ static void checkLoadedOnce(); } @end; -@interface NSString (NSStringToKotlin) +@interface NSString (NSStringToKotlin) @end; @implementation NSString (NSStringToKotlin) @@ -176,7 +176,7 @@ OBJ_GETTER(Kotlin_boxDouble, KDouble value); } -@interface NSNumber (NSNumberToKotlin) +@interface NSNumber (NSNumberToKotlin) @end; @implementation NSNumber (NSNumberToKotlin) @@ -202,7 +202,7 @@ OBJ_GETTER(Kotlin_boxDouble, KDouble value); } @end; -@interface NSDecimalNumber (NSDecimalNumberToKotlin) +@interface NSDecimalNumber (NSDecimalNumberToKotlin) @end; @implementation NSDecimalNumber (NSDecimalNumberToKotlin) diff --git a/runtime/src/objc/cpp/ObjCExportCollections.mm b/runtime/src/objc/cpp/ObjCExportCollections.mm index 272ef65a243..7ac5afc0b4d 100644 --- a/runtime/src/objc/cpp/ObjCExportCollections.mm +++ b/runtime/src/objc/cpp/ObjCExportCollections.mm @@ -81,7 +81,7 @@ static inline KInt objCIndexToKotlinOrThrow(NSUInteger index) { return index; } -@interface NSArray (NSArrayToKotlin) +@interface NSArray (NSArrayToKotlin) @end; @implementation NSArray (NSArrayToKotlin) @@ -94,7 +94,7 @@ static inline KInt objCIndexToKotlinOrThrow(NSUInteger index) { } @end; -@interface NSMutableArray (NSMutableArrayToKotlin) +@interface NSMutableArray (NSMutableArrayToKotlin) @end; @implementation NSMutableArray (NSArrayToKotlin) @@ -108,7 +108,7 @@ static inline KInt objCIndexToKotlinOrThrow(NSUInteger index) { @end; -@interface NSSet (NSSetToKotlin) +@interface NSSet (NSSetToKotlin) @end; @implementation NSSet (NSSetToKotlin) @@ -122,7 +122,7 @@ static inline KInt objCIndexToKotlinOrThrow(NSUInteger index) { @end; -@interface NSDictionary (NSDictionaryToKotlin) +@interface NSDictionary (NSDictionaryToKotlin) @end; @implementation NSDictionary (NSDictionaryToKotlin) @@ -165,7 +165,7 @@ static inline KInt objCIndexToKotlinOrThrow(NSUInteger index) { } @end; -@interface KListAsNSArray : NSArray +@interface KListAsNSArray : NSArray @end; @implementation KListAsNSArray { @@ -199,7 +199,7 @@ static inline KInt objCIndexToKotlinOrThrow(NSUInteger index) { @end; -@interface KMutableListAsNSMutableArray : NSMutableArray +@interface KMutableListAsNSMutableArray : NSMutableArray @end; @implementation KMutableListAsNSMutableArray { @@ -258,7 +258,7 @@ static inline KInt objCIndexToKotlinOrThrow(NSUInteger index) { @end; -@interface KSetAsNSSet : NSSet +@interface KSetAsNSSet : NSSet @end; static inline id KSet_getElement(KRef set, id object) { @@ -314,7 +314,7 @@ static inline id KSet_getElement(KRef set, id object) { } @end; -@interface KotlinMutableSet : NSMutableSet +@interface KotlinMutableSet : NSMutableSet @end; @implementation KotlinMutableSet { @@ -408,7 +408,7 @@ static inline id KSet_getElement(KRef set, id object) { } @end; -@interface KMapAsNSDictionary : NSDictionary +@interface KMapAsNSDictionary : NSDictionary @end; static inline id KMap_get(KRef map, id aKey) { @@ -462,7 +462,7 @@ static inline id KMap_get(KRef map, id aKey) { @end; -@interface KotlinMutableDictionary : NSMutableDictionary +@interface KotlinMutableDictionary : NSMutableDictionary @end; @implementation KotlinMutableDictionary {