Import as-needed without implicitly importing UIKit (#89)

* Import as-needed without implicitly importing UIKit * Remove duplicate imports * Try adding sandbox.h include_next back * Seems the sys header was too specific * Pass stdlib for ++ langs only * Conditionally include_next sandbox.h in sandbox.h * matrix.cxxflags -> additional_flags * Don't 'compile' directly * Remove quotes since these can be blank
theos · Nov 26, 2023 · 1c33d11 · 1c33d11
1 parent a2a4086
commit 1c33d11
Show file tree

Hide file tree

Showing 311 changed files with 638 additions and 77 deletions.
diff --git a/.github/workflows/compile-test.yml b/.github/workflows/compile-test.yml
@@ -18,6 +18,7 @@ jobs:
         with:
           repository: theos/sdks
           ref: bb425abf3acae8eac328b828628b82df544d2774 # pinned, should be updated as appropriate
+          sparse-checkout: iPhoneOS14.5.sdk
           path: sdks
 
       - name: Checkout theos/headers
@@ -36,30 +37,33 @@ jobs:
             "rocketbootstrap/rocketbootstrap_dynamic.h" # noted to not include directly
             "libundirect/libundirect_hookoverwrite.h" # user's responsibility to include either the base or dynamic header
           )
-          
+
+          ADDITIONAL_FLAGS=""
+          if [[ "${{ matrix.language }}" == *"++"* ]]; then
+            ADDITIONAL_FLAGS="-stdlib=libc++"
+          fi
+
           HEADER_DIR="headers"
           # cut to drop the leading directory
           for HEADER in $(find "${HEADER_DIR}" -name "*.h" | cut -c"$(( ${#HEADER_DIR} + 2))"-); do
-            
+
             for UNCHECKED_DIRECTORY in "${UNCHECKED_DIRECTORIES[@]}"; do
               if [[ "${HEADER}" == "${UNCHECKED_DIRECTORY}"/* ]]; then
                 continue 2
               fi
             done
-            
+
             for UNCHECKED_FILE in "${UNCHECKED_FILES[@]}"; do
               if [[ "${HEADER}" == "${UNCHECKED_FILE}" ]]; then
                 continue 2
               fi
             done
-            
+
             {
-              # Eventually we want to not require UIKit, but we're not there yet
-              echo "#import <UIKit/UIKit.h>"
               echo "#import <${HEADER}>"
               echo "int main() {}"
             } | clang -I "${HEADER_DIR}" -isysroot sdks/iPhoneOS14.5.sdk \
               -target arm64-apple-ios14.5 -arch arm64 \
               -x "${{ matrix.language }}" ${{ matrix.cflags }} \
-              -fsyntax-only -
+              ${ADDITIONAL_FLAGS} -fsyntax-only -
           done
diff --git a/AVFoundation/AVCaptureStillImageOutput+Private.h b/AVFoundation/AVCaptureStillImageOutput+Private.h
@@ -1,4 +1,5 @@
 #import <AVFoundation/AVFoundation.h>
+#import <CoreGraphics/CoreGraphics.h>
 
 @interface AVCaptureStillImageOutput (Private)
 

diff --git a/AVFoundation/AVCaptureStillImageRequest.h b/AVFoundation/AVCaptureStillImageRequest.h
@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
 
 @interface AVCaptureStillImageRequest : NSObject
 

diff --git a/AddressBookUI/ABMonogrammer.h b/AddressBookUI/ABMonogrammer.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <UIKit/UIImage.h>
 
 typedef NS_ENUM(NSUInteger, ABMonogrammerStyle) {
 	ABMonogrammerStyleLightGray,

diff --git a/AlienBlue/AlienBlueAppDelegate.h b/AlienBlue/AlienBlueAppDelegate.h
@@ -1,3 +1,6 @@
+#import <UIKit/UIApplication.h>
+#import <UIKit/UIWindow.h>
+
 @interface AlienBlueAppDelegate : NSObject <UIApplicationDelegate>
 
 @property (nonatomic, retain) UIWindow *window;

diff --git a/AlienBlue/AppSchemeCoordinator.h b/AlienBlue/AppSchemeCoordinator.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+
 @interface AppSchemeCoordinator : NSObject
 
 + (void)openRedditThreadUrl:(NSString *)url;

diff --git a/AlienBlue/JMOutlineViewController.h b/AlienBlue/JMOutlineViewController.h
@@ -1,3 +1,5 @@
+#import <UIKit/UIViewController.h>
+
 @interface JMOutlineViewController : UIViewController
 
 @end
diff --git a/AlienBlue/NavigationManager.h b/AlienBlue/NavigationManager.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+
 @class Post;
 
 @interface NavigationManager : NSObject

diff --git a/AlienBlue/Post.h b/AlienBlue/Post.h
@@ -1,4 +1,5 @@
 #import "VotableElement.h"
+#import <Foundation/NSString.h>
 
 @interface Post : VotableElement
 

diff --git a/AlienBlue/PostsViewController.h b/AlienBlue/PostsViewController.h
@@ -1,3 +1,5 @@
+#import <UIKit/UIViewController.h>
+
 @interface PostsViewController : UIViewController
 
 - (instancetype)initWithSubreddit:(NSString *)subreddit title:(NSString *)title;

diff --git a/AlienBlue/VotableElement.h b/AlienBlue/VotableElement.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @interface VotableElement : NSObject
 
 @end
diff --git a/Anemone/ANEMSettingsManager.h b/Anemone/ANEMSettingsManager.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+
 @interface ANEMSettingsManager : NSObject
 
 + (instancetype)sharedManager;

diff --git a/AppList/ALApplicationList.h b/AppList/ALApplicationList.h
@@ -1,6 +1,4 @@
 #import <UIKit/UIKit.h>
-#import <Foundation/Foundation.h>
-#import <CoreGraphics/CoreGraphics.h>
 #import <libkern/OSAtomic.h>
 
 enum {

diff --git a/AppList/ALApplicationTableDataSource.h b/AppList/ALApplicationTableDataSource.h
@@ -1,5 +1,4 @@
 #import <UIKit/UIKit.h>
-#import <Foundation/Foundation.h>
 #import <libkern/OSAtomic.h>
 
 @class ALApplicationList;

diff --git a/AppList/ALValueCell.h b/AppList/ALValueCell.h
@@ -1,5 +1,4 @@
 #import <UIKit/UIKit.h>
-#import <Foundation/Foundation.h>
 
 @protocol ALValueCellDelegate;
 

diff --git a/AppSupport/CPBitmapStore.h b/AppSupport/CPBitmapStore.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @interface CPBitmapStore : NSObject
 
 - (void)purge;

diff --git a/AppSupport/CPDistributedMessagingCenter.h b/AppSupport/CPDistributedMessagingCenter.h
@@ -1,3 +1,8 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSError.h>
+
 @interface CPDistributedMessagingCenter : NSObject
 
 + (instancetype)centerNamed:(NSString *)name;

diff --git a/ApplePushService/APSMessage.h b/ApplePushService/APSMessage.h
@@ -1,3 +1,8 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSObjCRuntime.h>
+
 @interface APSMessage : NSObject <NSCoding>
 
 - (id)initWithDictionary:(NSDictionary *)dictionary;

diff --git a/AssertionServices/BKSProcess.h b/AssertionServices/BKSProcess.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @interface BKSProcess : NSObject
 
 @property (nonatomic, assign) BOOL nowPlayingWithAudio;

diff --git a/AssertionServices/BKSProcessAssertion.h b/AssertionServices/BKSProcessAssertion.h
@@ -1,3 +1,7 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSObjCRuntime.h>
+#import <Foundation/NSString.h>
+
 #define kBKSBackgroundModeUnboundedTaskCompletion @"unboundedTaskCompletion"
 #define kBKSBackgroundModeContinuous              @"continuous"
 #define kBKSBackgroundModeFetch                   @"fetch"

diff --git a/BaseBoard/BSAction.h b/BaseBoard/BSAction.h
@@ -1,6 +1,7 @@
 #import "BSDescriptionProviding.h"
 #import "BSSettingDescriptionProvider.h"
 #import "BSXPCCoding.h"
+#import <Foundation/Foundation.h>
 
 @interface BSAction : NSObject <BSDescriptionProviding, BSSettingDescriptionProvider, BSXPCCoding>
 

diff --git a/BaseBoard/BSAuditToken.h b/BaseBoard/BSAuditToken.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+
 @interface BSAuditToken : NSObject <NSCopying>
 
 @property (nonatomic, copy, readonly) NSString *bundleID;

diff --git a/BaseBoard/BSBaseXPCClient.h b/BaseBoard/BSBaseXPCClient.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @interface BSBaseXPCClient : NSObject
 
 @end
diff --git a/BaseBoard/BSPlatform.h b/BaseBoard/BSPlatform.h
@@ -1,4 +1,6 @@
-#import <Foundation/Foundation.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSObjCRuntime.h>
 
 typedef NS_ENUM(NSUInteger, BSDeviceClass) {
 	BSDeviceClassIPhone,

diff --git a/BaseBoard/BSProcessHandle.h b/BaseBoard/BSProcessHandle.h
@@ -1,3 +1,7 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSObjCRuntime.h>
+
 @class BSMachPortTaskNameRight;
 
 @interface BSProcessHandle : NSObject

diff --git a/BaseBoard/BSSettings.h b/BaseBoard/BSSettings.h
@@ -1,3 +1,7 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSObjCRuntime.h>
+#import <Foundation/NSIndexSet.h>
+
 typedef NS_ENUM(NSUInteger, BSSettingType) {
 	BSSettingTypeThisIsAReminderToFillOutTheseEnumNames = 8
 };

diff --git a/BaseBoardUI/UIViewController+BaseBoardUI.h b/BaseBoardUI/UIViewController+BaseBoardUI.h
@@ -1,3 +1,5 @@
+#import <UIKit/UIViewController.h>
+
 @interface UIViewController (BaseBoardUI)
 
 - (BOOL)bs_addChildViewController:(UIViewController *)childController;

diff --git a/BiteSMS/BSQCQRLauncher.h b/BiteSMS/BSQCQRLauncher.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @interface BSQCQRLauncher : NSObject
 
 + (void)showQuickCompose:(BOOL)isLocked;

diff --git a/BulletinBoard/BBAction.h b/BulletinBoard/BBAction.h
@@ -1,3 +1,7 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
+
 typedef void (^BBActionCallblock)();
 
 @class BBAppearance;

diff --git a/BulletinBoard/BBAppearance.h b/BulletinBoard/BBAppearance.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+
 @interface BBAppearance : NSObject
 
 + (instancetype)appearanceWithTitle:(NSString *)title;

diff --git a/BulletinBoard/BBBulletin.h b/BulletinBoard/BBBulletin.h
@@ -1,4 +1,5 @@
 #import <AddressBook/AddressBook.h>
+#import <Foundation/Foundation.h>
 
 @class BBAction, BBContent, BBSectionIcon, BBSectionParameters, BBSectionSubtypeParameters;
 

diff --git a/BulletinBoard/BBDataProvider.h b/BulletinBoard/BBDataProvider.h
@@ -1,3 +1,6 @@
+#import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
+
 @class BBActionResponse, BBBulletinRequestParameters, BBDataProviderIdentity, BBSectionIcon, BBSectionInfo, BBSectionParameters, BBThumbnailSizeConstraints;
 
 @protocol BBSectionIdentity <NSObject>

diff --git a/BulletinBoard/BBDataProviderIdentity.h b/BulletinBoard/BBDataProviderIdentity.h
@@ -1,3 +1,7 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSArray.h>
+
 @class BBDataProvider, BBSectionInfo, BBSectionParameters;
 
 @interface BBDataProviderIdentity : NSObject

diff --git a/BulletinBoard/BBLocalDataProviderStore.h b/BulletinBoard/BBLocalDataProviderStore.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @protocol BBDataProvider;
 
 @interface BBLocalDataProviderStore : NSObject

diff --git a/BulletinBoard/BBSectionIcon.h b/BulletinBoard/BBSectionIcon.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @class BBSectionIconVariant;
 
 @interface BBSectionIcon : NSObject

diff --git a/BulletinBoard/BBSectionIconVariant.h b/BulletinBoard/BBSectionIconVariant.h
@@ -1,3 +1,7 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSObjCRuntime.h>
+#import <Foundation/NSData.h>
+
 @interface BBSectionIconVariant : NSObject
 
 + (instancetype)variantWithFormat:(NSUInteger)format imageData:(NSData *)data;

diff --git a/BulletinBoard/BBSectionInfoSettings.h b/BulletinBoard/BBSectionInfoSettings.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSObjCRuntime.h>
+
 typedef NS_OPTIONS(NSUInteger, BBSectionInfoPushSettings) {
 	BBSectionInfoPushSettingsBadges = 1 << 0,
 	BBSectionInfoPushSettingsSounds = 1 << 1,

diff --git a/BulletinBoard/BBSectionParameters.h b/BulletinBoard/BBSectionParameters.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSDictionary.h>
+
 @class BBSectionSubtypeParameters;
 
 @interface BBSectionParameters : NSObject

diff --git a/BulletinBoard/BBSectionSubtypeParameters.h b/BulletinBoard/BBSectionSubtypeParameters.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @interface BBSectionSubtypeParameters : NSObject
 
 @property (nonatomic) BOOL allowsAddingToLockScreenWhenUnlocked;

diff --git a/BulletinBoard/BBSettingsGateway.h b/BulletinBoard/BBSettingsGateway.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+
 @class BBSectionInfo;
 
 typedef void (^BBSettingsGatewayGetSectionInfoCompletion)(BBSectionInfo *sectionInfo);

diff --git a/BulletinBoard/BBThumbnailSizeConstraints.h b/BulletinBoard/BBThumbnailSizeConstraints.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <CoreGraphics/CoreGraphics.h>
+
 @interface BBThumbnailSizeConstraints : NSObject
 
 @property (nonatomic) CGFloat fixedWidth;

diff --git a/BulletinBoard/BBWeeAppController.h b/BulletinBoard/BBWeeAppController.h
@@ -1,3 +1,6 @@
+#import <UIKit/UIView.h>
+#import <UIKit/UIApplication.h>
+
 @protocol BBWeeAppController
 
 - (UIView *)view;

diff --git a/CameraKit/UIView+CameraKitAdditions.h b/CameraKit/UIView+CameraKitAdditions.h
@@ -1,4 +1,3 @@
-#import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
 @interface UIView (CameraKit)

diff --git a/Celestial/AVController.h b/Celestial/AVController.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @interface AVController : NSObject
 
 @end
diff --git a/Celestial/AVItem.h b/Celestial/AVItem.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @interface AVItem : NSObject
 
 @end
diff --git a/Celestial/AVQueue.h b/Celestial/AVQueue.h
@@ -1,3 +1,5 @@
+#import <Foundation/NSObject.h>
+
 @interface AVQueue : NSObject
 
 @end
diff --git a/ChatKit/CKConversation.h b/ChatKit/CKConversation.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+
 @class IMChat;
 
 @interface CKConversation : NSObject

diff --git a/ChatKit/CKConversationList.h b/ChatKit/CKConversationList.h
@@ -1,3 +1,6 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+
 @interface CKConversationList : NSObject {
 	NSMutableArray *_trackedConversations;
 }

diff --git a/ChatKit/CKConversationListCell.h b/ChatKit/CKConversationListCell.h
@@ -1,3 +1,6 @@
+#import <UIKit/UITableViewCell.h>
+#import <UIKit/UILabel.h>
+
 @class CKConversation;
 
 @interface CKConversationListCell : UITableViewCell {

diff --git a/ChatKit/CKConversationListController.h b/ChatKit/CKConversationListController.h
@@ -1,3 +1,5 @@
+#import <UIKit/UITableViewController.h>
+
 @class CKConversationList;
 
 @interface CKConversationListController : UITableViewController

diff --git a/ChatKit/CKDNDList.h b/ChatKit/CKDNDList.h
@@ -1,3 +1,7 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSString.h>
+
 @interface CKDNDList : NSObject
 
 + (instancetype)sharedList;

diff --git a/ChatKit/CKDetailsCell.h b/ChatKit/CKDetailsCell.h
@@ -1,3 +1,6 @@
+#import <UIKit/UITableViewCell.h>
+#import <UIKit/UIView.h>
+
 @interface CKDetailsCell : UITableViewCell
 
 @property (nonatomic, retain) UIView *topSeperator;