[K/N] Include frameworks via umbrella headers only ^KT-65409

kotlin-native/runtime/src/main/cpp/ObjCExceptions.cpp

@@ -3,7 +3,7 @@
 #include <dlfcn.h>
 #include <inttypes.h>
 #include <mach-o/loader.h>
-#include <CoreFoundation/CFRunLoop.h>
+#include <CoreFoundation/CoreFoundation.h>
 #include "Natives.h"
 #include "ObjCExceptions.h"
 #include "Types.h"

kotlin-native/runtime/src/main/cpp/ObjCExport.h

@@ -9,7 +9,7 @@
 #if KONAN_OBJC_INTEROP
 
 #import <objc/runtime.h>
-#import <Foundation/NSString.h>
+#import <Foundation/Foundation.h>
 
 #import "Types.h"
 #import "Memory.h"

kotlin-native/runtime/src/main/cpp/ObjCExport.mm

@@ -17,14 +17,7 @@
 #include <unordered_set>
 #include <vector>
 
-#import <Foundation/NSObject.h>
-#import <Foundation/NSValue.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSMethodSignature.h>
-#import <Foundation/NSError.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSDecimalNumber.h>
-#import <Foundation/NSDictionary.h>
+#import <Foundation/Foundation.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
 #import <objc/objc-exception.h>

kotlin-native/runtime/src/main/cpp/ObjCExportCollectionUtils.mm

@@ -21,9 +21,7 @@
 
 #import <objc/runtime.h>
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSSet.h>
+#import <Foundation/Foundation.h>
 
 #import "CallsChecker.hpp"
 #import "Exceptions.h"

kotlin-native/runtime/src/main/cpp/ObjCExportCollections.h

@@ -20,7 +20,7 @@
 #if KONAN_OBJC_INTEROP
 
 #import <objc/runtime.h>
-#import <Foundation/NSNull.h>
+#import <Foundation/Foundation.h>
 
 #import "Memory.h"
 #import "ObjCExport.h"

kotlin-native/runtime/src/main/cpp/ObjCExportCoroutines.mm

@@ -10,8 +10,7 @@
 #if KONAN_OBJC_INTEROP
 
 #import <pthread.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSObject.h>
+#import <Foundation/Foundation.h>
 
 typedef void (^Completion)(id _Nullable, NSError* _Nullable);
 

kotlin-native/runtime/src/main/cpp/ObjCExportErrors.mm

@@ -16,9 +16,7 @@
 
 #if KONAN_OBJC_INTEROP
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSError.h>
-#import <Foundation/NSString.h>
+#import <Foundation/Foundation.h>
 
 #import "Exceptions.h"
 #import "ObjCExport.h"

kotlin-native/runtime/src/main/cpp/ObjCExportExceptionDetails.mm

@@ -20,7 +20,7 @@
 
 #if KONAN_OBJC_INTEROP
 
-#import <Foundation/NSException.h>
+#import <Foundation/Foundation.h>
 
 //! TODO: Use not_null signature.
 OBJ_GETTER(Kotlin_ObjCExport_ExceptionDetails, KRef /*thiz*/, KRef exceptionHolder) {

kotlin-native/runtime/src/main/cpp/ObjCInterop.h

@@ -8,9 +8,7 @@
 
 #if KONAN_OBJC_INTEROP
 
-#include <Foundation/NSString.h>
-#include <Foundation/NSException.h>
-#include <objc/objc-exception.h>
+#include <Foundation/Foundation.h>
 
 #include <objc/objc.h>
 #include <objc/runtime.h>

kotlin-native/runtime/src/main/cpp/ObjCInterop.mm

@@ -5,7 +5,7 @@
 
 #if KONAN_OBJC_INTEROP
 
-#import <Foundation/NSException.h>
+#import <Foundation/Foundation.h>
 #import <objc/objc-exception.h>
 
 #include <objc/objc.h>

kotlin-native/runtime/src/main/cpp/ObjCInteropUtils.mm

@@ -8,9 +8,8 @@
 #if KONAN_OBJC_INTEROP
 
 #import <objc/runtime.h>
-#import <CoreFoundation/CFString.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <Foundation/Foundation.h>
 #import "Memory.h"
 #import "ObjCInteropUtils.h"
 #import "ObjCInteropUtilsPrivate.h"

kotlin-native/runtime/src/main/cpp/objc_support/CFClock.hpp

@@ -8,7 +8,7 @@
 #if KONAN_HAS_FOUNDATION_FRAMEWORK
 
 #include <chrono>
-#include <CoreFoundation/CFDate.h>
+#include <CoreFoundation/CoreFoundation.h>
 
 namespace kotlin::objc_support {
 

kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscription.mm

@@ -7,7 +7,7 @@
 
 #include "NSNotificationSubscription.hpp"
 
-#import <Foundation/NSNotification.h>
+#import <Foundation/Foundation.h>
 
 using namespace kotlin;
 

kotlin-native/runtime/src/main/cpp/objc_support/NSNotificationSubscriptionTest.mm

@@ -7,8 +7,7 @@
 
 #include "NSNotificationSubscription.hpp"
 
-#import <Foundation/NSNotification.h>
-#import <Foundation/NSString.h>
+#import <Foundation/Foundation.h>
 #include <memory>
 
 #include "gmock/gmock.h"

kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.hpp

@@ -11,7 +11,7 @@
 #error "Assumes that ARC is not used"
 #endif
 
-#include <CoreFoundation/CFBase.h>
+#include <CoreFoundation/CoreFoundation.h>
 #include <functional>
 #include <utility>
 

kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtr.mm

@@ -7,7 +7,7 @@
 
 #include "ObjectPtr.hpp"
 
-#import <Foundation/NSObject.h>
+#import <Foundation/Foundation.h>
 
 using namespace kotlin;
 

kotlin-native/runtime/src/main/cpp/objc_support/ObjectPtrTest.mm

@@ -7,9 +7,8 @@
 
 #include "ObjectPtr.hpp"
 
-#import <CoreFoundation/CFArray.h>
-#import <Foundation/NSArray.h>
-#import <Foundation/NSObject.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <Foundation/Foundation.h>
 #include <functional>
 #include <memory>
 

kotlin-native/runtime/src/main/cpp/objc_support/RunLoopSource.hpp

@@ -8,7 +8,6 @@
 #if KONAN_HAS_FOUNDATION_FRAMEWORK
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <CoreFoundation/CFRunLoop.h>
 
 #include "RawPtr.hpp"
 #include "Utils.hpp"

kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTestSupport.hpp

@@ -9,7 +9,7 @@
 
 #include <condition_variable>
 #include <mutex>
-#include <CoreFoundation/CFRunLoop.h>
+#include <CoreFoundation/CoreFoundation.h>
 
 #include "ScopedThread.hpp"
 #include "Utils.hpp"

kotlin-native/runtime/src/main/cpp/objc_support/RunLoopTimer.hpp

@@ -8,7 +8,6 @@
 #if KONAN_HAS_FOUNDATION_FRAMEWORK
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <CoreFoundation/CFRunLoop.h>
 
 #include "RawPtr.hpp"
 #include "Utils.hpp"

kotlin-native/runtime/src/mm/cpp/AppStateTrackingUIKit.mm

@@ -9,7 +9,7 @@
 
 #include <functional>
 
-#import <UIKit/UIApplication.h>
+#import <UIKit/UIKit.h>
 
 #include "CompilerConstants.hpp"
 #include "objc_support/NSNotificationSubscription.hpp"

kotlin-native/runtime/src/objc/cpp/ObjCExportClasses.mm

@@ -9,11 +9,7 @@
 
 #if KONAN_OBJC_INTEROP
 
-#import <Foundation/NSObject.h>
-#import <Foundation/NSValue.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSDecimalNumber.h>
+#import <Foundation/Foundation.h>
 #import <objc/runtime.h>
 #import <objc/objc-exception.h>
 #import <dispatch/dispatch.h>

kotlin-native/runtime/src/objc/cpp/ObjCExportCollections.mm

@@ -22,11 +22,7 @@
 
 #import <objc/runtime.h>
 
-#import <Foundation/NSObject.h>
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSSet.h>
-#import <Foundation/NSNull.h>
+#import <Foundation/Foundation.h>
 
 #import "Exceptions.h"
 #import "Runtime.h"

kotlin-native/runtime/src/objc/cpp/ObjCExportNumbers.mm

@@ -16,10 +16,7 @@
 
 #if KONAN_OBJC_INTEROP
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSError.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
+#import <Foundation/Foundation.h>
 
 #import "ObjCExport.h"
 #import "Runtime.h"

kotlin-native/runtime/src/objc/cpp/ObjCInteropUtilsClasses.mm

@@ -6,7 +6,7 @@
 #if KONAN_OBJC_INTEROP
 
 #import <objc/runtime.h>
-#import <Foundation/NSObject.h>
+#import <Foundation/Foundation.h>
 #import "Memory.h"
 #import "MemorySharedRefs.hpp"
 #import "ObjCExportPrivate.h"

kotlin-native/runtime/src/test_support/cpp/CompilerGeneratedObjC.mm

@@ -7,7 +7,7 @@
 
 #include "TestSupportCompilerGenerated.hpp"
 
-#include <Foundation/NSObject.h>
+#include <Foundation/Foundation.h>
 #include <objc/runtime.h>
 
 #include "Types.h"