diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExceptions.cpp b/kotlin-native/runtime/src/main/cpp/ObjCExceptions.cpp index 21d7ab2b502..e8273e9074d 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCExceptions.cpp +++ b/kotlin-native/runtime/src/main/cpp/ObjCExceptions.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "Natives.h" #include "ObjCExceptions.h" #include "Types.h" diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExport.h b/kotlin-native/runtime/src/main/cpp/ObjCExport.h index 14faa81fb2e..14094feca12 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCExport.h +++ b/kotlin-native/runtime/src/main/cpp/ObjCExport.h @@ -9,7 +9,7 @@ #if KONAN_OBJC_INTEROP #import -#import +#import #import "Types.h" #import "Memory.h" diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExport.mm b/kotlin-native/runtime/src/main/cpp/ObjCExport.mm index a49a70c556a..9d0ca5c1cae 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCExport.mm +++ b/kotlin-native/runtime/src/main/cpp/ObjCExport.mm @@ -17,14 +17,7 @@ #include #include -#import -#import -#import -#import -#import -#import -#import -#import +#import #import #import #import diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExportCollectionUtils.mm b/kotlin-native/runtime/src/main/cpp/ObjCExportCollectionUtils.mm index a3f1e0fa241..cc98b1dfebf 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCExportCollectionUtils.mm +++ b/kotlin-native/runtime/src/main/cpp/ObjCExportCollectionUtils.mm @@ -21,9 +21,7 @@ #import -#import -#import -#import +#import #import "CallsChecker.hpp" #import "Exceptions.h" diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExportCollections.h b/kotlin-native/runtime/src/main/cpp/ObjCExportCollections.h index dd56b3ddaee..e0a07d2e22d 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCExportCollections.h +++ b/kotlin-native/runtime/src/main/cpp/ObjCExportCollections.h @@ -20,7 +20,7 @@ #if KONAN_OBJC_INTEROP #import -#import +#import #import "Memory.h" #import "ObjCExport.h" diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExportCoroutines.mm b/kotlin-native/runtime/src/main/cpp/ObjCExportCoroutines.mm index 0942ef4970e..6461fc9c3b7 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCExportCoroutines.mm +++ b/kotlin-native/runtime/src/main/cpp/ObjCExportCoroutines.mm @@ -10,8 +10,7 @@ #if KONAN_OBJC_INTEROP #import -#import -#import +#import typedef void (^Completion)(id _Nullable, NSError* _Nullable); diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExportErrors.mm b/kotlin-native/runtime/src/main/cpp/ObjCExportErrors.mm index b3f0dab450c..e2776c9ccf4 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCExportErrors.mm +++ b/kotlin-native/runtime/src/main/cpp/ObjCExportErrors.mm @@ -16,9 +16,7 @@ #if KONAN_OBJC_INTEROP -#import -#import -#import +#import #import "Exceptions.h" #import "ObjCExport.h" diff --git a/kotlin-native/runtime/src/main/cpp/ObjCExportExceptionDetails.mm b/kotlin-native/runtime/src/main/cpp/ObjCExportExceptionDetails.mm index d1a0e55a303..b783befcf12 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCExportExceptionDetails.mm +++ b/kotlin-native/runtime/src/main/cpp/ObjCExportExceptionDetails.mm @@ -20,7 +20,7 @@ #if KONAN_OBJC_INTEROP -#import +#import //! TODO: Use not_null signature. OBJ_GETTER(Kotlin_ObjCExport_ExceptionDetails, KRef /*thiz*/, KRef exceptionHolder) { diff --git a/kotlin-native/runtime/src/main/cpp/ObjCInterop.h b/kotlin-native/runtime/src/main/cpp/ObjCInterop.h index c3a29d33886..7e4f1bd438b 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCInterop.h +++ b/kotlin-native/runtime/src/main/cpp/ObjCInterop.h @@ -8,9 +8,7 @@ #if KONAN_OBJC_INTEROP -#include -#include -#include +#include #include #include diff --git a/kotlin-native/runtime/src/main/cpp/ObjCInterop.mm b/kotlin-native/runtime/src/main/cpp/ObjCInterop.mm index 687999cb379..3aaa5f88b78 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCInterop.mm +++ b/kotlin-native/runtime/src/main/cpp/ObjCInterop.mm @@ -5,7 +5,7 @@ #if KONAN_OBJC_INTEROP -#import +#import #import #include diff --git a/kotlin-native/runtime/src/main/cpp/ObjCInteropUtils.mm b/kotlin-native/runtime/src/main/cpp/ObjCInteropUtils.mm index 7941af55c41..b0bc6533a92 100644 --- a/kotlin-native/runtime/src/main/cpp/ObjCInteropUtils.mm +++ b/kotlin-native/runtime/src/main/cpp/ObjCInteropUtils.mm @@ -8,9 +8,8 @@ #if KONAN_OBJC_INTEROP #import -#import -#import -#import +#import +#import #import "Memory.h" #import "ObjCInteropUtils.h" #import "ObjCInteropUtilsPrivate.h" diff --git a/kotlin-native/runtime/src/main/cpp/objc_support/CFClock.hpp b/kotlin-native/runtime/src/main/cpp/objc_support/CFClock.hpp index 7efd2299892..88ef279cbd4 100644 --- a/kotlin-native/runtime/src/main/cpp/objc_support/CFClock.hpp +++ b/kotlin-native/runtime/src/main/cpp/objc_support/CFClock.hpp @@ -8,7 +8,7 @@ #if KONAN_HAS_FOUNDATION_FRAMEWORK #include -#include +#include namespace kotlin::objc_support { diff --git a/kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscription.mm b/kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscription.mm index 45c416deb73..e66959fbe26 100644 --- a/kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscription.mm +++ b/kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscription.mm @@ -7,7 +7,7 @@ #include "NSNotificationSubscription.hpp" -#import +#import using namespace kotlin; diff --git a/kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscriptionTest.mm b/kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscriptionTest.mm index bb4c0d56fa4..62b8045e937 100644 --- a/kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscriptionTest.mm +++ b/kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscriptionTest.mm @@ -7,8 +7,7 @@ #include "NSNotificationSubscription.hpp" -#import -#import +#import #include #include "gmock/gmock.h" diff --git a/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.hpp b/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.hpp index f8c93323e80..a65296ec5d4 100644 --- a/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.hpp +++ b/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.hpp @@ -11,7 +11,7 @@ #error "Assumes that ARC is not used" #endif -#include +#include #include #include diff --git a/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.mm b/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.mm index 61ffe9801d1..c95f4f33d45 100644 --- a/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.mm +++ b/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.mm @@ -7,7 +7,7 @@ #include "ObjectPtr.hpp" -#import +#import using namespace kotlin; diff --git a/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtrTest.mm b/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtrTest.mm index 38622a1354c..0423aab9077 100644 --- a/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtrTest.mm +++ b/kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtrTest.mm @@ -7,9 +7,8 @@ #include "ObjectPtr.hpp" -#import -#import -#import +#import +#import #include #include diff --git a/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopSource.hpp b/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopSource.hpp index 501bc095fc2..afa685e6e92 100644 --- a/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopSource.hpp +++ b/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopSource.hpp @@ -8,7 +8,6 @@ #if KONAN_HAS_FOUNDATION_FRAMEWORK #include -#include #include "RawPtr.hpp" #include "Utils.hpp" diff --git a/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTestSupport.hpp b/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTestSupport.hpp index 9f139511a14..0907bc1d4e8 100644 --- a/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTestSupport.hpp +++ b/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTestSupport.hpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include "ScopedThread.hpp" #include "Utils.hpp" diff --git a/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTimer.hpp b/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTimer.hpp index 1e6e4b2cef7..3fb305c16fa 100644 --- a/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTimer.hpp +++ b/kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTimer.hpp @@ -8,7 +8,6 @@ #if KONAN_HAS_FOUNDATION_FRAMEWORK #include -#include #include "RawPtr.hpp" #include "Utils.hpp" diff --git a/kotlin-native/runtime/src/mm/cpp/AppStateTrackingUIKit.mm b/kotlin-native/runtime/src/mm/cpp/AppStateTrackingUIKit.mm index 942b055a9e7..52f60c39a55 100644 --- a/kotlin-native/runtime/src/mm/cpp/AppStateTrackingUIKit.mm +++ b/kotlin-native/runtime/src/mm/cpp/AppStateTrackingUIKit.mm @@ -9,7 +9,7 @@ #include -#import +#import #include "CompilerConstants.hpp" #include "objc_support/NSNotificationSubscription.hpp" diff --git a/kotlin-native/runtime/src/objc/cpp/ObjCExportClasses.mm b/kotlin-native/runtime/src/objc/cpp/ObjCExportClasses.mm index 43269b50d2d..e3da593f9bf 100644 --- a/kotlin-native/runtime/src/objc/cpp/ObjCExportClasses.mm +++ b/kotlin-native/runtime/src/objc/cpp/ObjCExportClasses.mm @@ -9,11 +9,7 @@ #if KONAN_OBJC_INTEROP -#import -#import -#import -#import -#import +#import #import #import #import diff --git a/kotlin-native/runtime/src/objc/cpp/ObjCExportCollections.mm b/kotlin-native/runtime/src/objc/cpp/ObjCExportCollections.mm index b45295a256c..4eb329a1923 100644 --- a/kotlin-native/runtime/src/objc/cpp/ObjCExportCollections.mm +++ b/kotlin-native/runtime/src/objc/cpp/ObjCExportCollections.mm @@ -22,11 +22,7 @@ #import -#import -#import -#import -#import -#import +#import #import "Exceptions.h" #import "Runtime.h" diff --git a/kotlin-native/runtime/src/objc/cpp/ObjCExportNumbers.mm b/kotlin-native/runtime/src/objc/cpp/ObjCExportNumbers.mm index 24b0973debb..2ae9f92b3ab 100644 --- a/kotlin-native/runtime/src/objc/cpp/ObjCExportNumbers.mm +++ b/kotlin-native/runtime/src/objc/cpp/ObjCExportNumbers.mm @@ -16,10 +16,7 @@ #if KONAN_OBJC_INTEROP -#import -#import -#import -#import +#import #import "ObjCExport.h" #import "Runtime.h" diff --git a/kotlin-native/runtime/src/objc/cpp/ObjCInteropUtilsClasses.mm b/kotlin-native/runtime/src/objc/cpp/ObjCInteropUtilsClasses.mm index 1bdbfe27767..1da5e25c448 100644 --- a/kotlin-native/runtime/src/objc/cpp/ObjCInteropUtilsClasses.mm +++ b/kotlin-native/runtime/src/objc/cpp/ObjCInteropUtilsClasses.mm @@ -6,7 +6,7 @@ #if KONAN_OBJC_INTEROP #import -#import +#import #import "Memory.h" #import "MemorySharedRefs.hpp" #import "ObjCExportPrivate.h" diff --git a/kotlin-native/runtime/src/test_support/cpp/CompilerGeneratedObjC.mm b/kotlin-native/runtime/src/test_support/cpp/CompilerGeneratedObjC.mm index b138ff0b36c..207c37ff9de 100644 --- a/kotlin-native/runtime/src/test_support/cpp/CompilerGeneratedObjC.mm +++ b/kotlin-native/runtime/src/test_support/cpp/CompilerGeneratedObjC.mm @@ -7,7 +7,7 @@ #include "TestSupportCompilerGenerated.hpp" -#include +#include #include #include "Types.h"