bugsnag · nickdowell · Sep 13, 2022 · Sep 12, 2022 · Sep 12, 2022
diff --git a/Bugsnag.xcodeproj/project.pbxproj b/Bugsnag.xcodeproj/project.pbxproj
@@ -3984,6 +3984,10 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"BSG_OBJC_DIRECT_MEMBERS=''",
+				);
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4024,6 +4028,10 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 372ZUL2ZB7;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"BSG_OBJC_DIRECT_MEMBERS=''",
+				);
 				INFOPLIST_FILE = Tests/BugsnagTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4070,6 +4078,10 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"BSG_OBJC_DIRECT_MEMBERS=''",
+				);
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4110,6 +4122,10 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"BSG_OBJC_DIRECT_MEMBERS=''",
+				);
 				INFOPLIST_FILE = Tests/BugsnagTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4152,6 +4168,10 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"BSG_OBJC_DIRECT_MEMBERS=''",
+				);
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4191,6 +4211,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"BSG_OBJC_DIRECT_MEMBERS=''",
+				);
 				INFOPLIST_FILE = Tests/BugsnagTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4315,6 +4339,10 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"BSG_OBJC_DIRECT_MEMBERS=''",
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -4426,6 +4454,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 372ZUL2ZB7;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"BSG_OBJC_DIRECT_MEMBERS=''",
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;

diff --git a/Bugsnag/Breadcrumbs/BSGNotificationBreadcrumbs.h b/Bugsnag/Breadcrumbs/BSGNotificationBreadcrumbs.h
@@ -8,12 +8,15 @@
 
 #import <Bugsnag/BugsnagBreadcrumb.h>
 
+#import "BSGDefines.h"
+
 @class BugsnagConfiguration;
 
 NS_ASSUME_NONNULL_BEGIN
 
 static NSString * const BSGNotificationBreadcrumbsMessageAppWillTerminate = @"App Will Terminate";
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BSGNotificationBreadcrumbs : NSObject
 
 #pragma mark Initializers

diff --git a/Bugsnag/Breadcrumbs/BSGNotificationBreadcrumbs.m b/Bugsnag/Breadcrumbs/BSGNotificationBreadcrumbs.m
@@ -19,13 +19,33 @@
 #define BSG_HAVE_TABLE_VIEW    (TARGET_OS_OSX || TARGET_OS_IOS || TARGET_OS_TV)
 #define BSG_HAVE_TEXT_CONTROL  (TARGET_OS_OSX || TARGET_OS_IOS                )
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BSGNotificationBreadcrumbs ()
 
 @property (nonatomic) NSDictionary<NSNotificationName, NSString *> *notificationNameMap;
 
 @end
 
+@interface BSGNotificationBreadcrumbs (/* not objc_direct */)
 
+- (void)addBreadcrumbForNotification:(NSNotification *)notification;
+
+- (void)addBreadcrumbForControlNotification:(NSNotification *)notification;
+
+- (void)addBreadcrumbForMenuItemNotification:(NSNotification *)notification;
+
+- (void)addBreadcrumbForTableViewNotification:(NSNotification *)notification;
+
+#if TARGET_OS_IOS
+- (void)orientationDidChange:(NSNotification *)notification;
+#endif
+
+- (void)thermalStateDidChange:(NSNotification *)notification API_AVAILABLE(ios(11.0), tvos(11.0));
+
+@end
+
+
+BSG_OBJC_DIRECT_MEMBERS
 @implementation BSGNotificationBreadcrumbs
 
 - (instancetype)initWithConfiguration:(BugsnagConfiguration *)configuration

diff --git a/Bugsnag/Breadcrumbs/BugsnagBreadcrumbs.h b/Bugsnag/Breadcrumbs/BugsnagBreadcrumbs.h
@@ -8,12 +8,15 @@
 
 #import <Foundation/Foundation.h>
 
+#import "BSGDefines.h"
+
 @class BugsnagBreadcrumb;
 @class BugsnagConfiguration;
 typedef struct BSG_KSCrashReportWriter BSG_KSCrashReportWriter;
 
 NS_ASSUME_NONNULL_BEGIN
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BugsnagBreadcrumbs : NSObject
 
 - (instancetype)initWithConfiguration:(BugsnagConfiguration *)config;

diff --git a/Bugsnag/Breadcrumbs/BugsnagBreadcrumbs.m b/Bugsnag/Breadcrumbs/BugsnagBreadcrumbs.m
@@ -47,6 +47,7 @@ @interface BugsnagBreadcrumbs ()
 
 #pragma mark -
 
+BSG_OBJC_DIRECT_MEMBERS
 @implementation BugsnagBreadcrumbs
 
 - (instancetype)initWithConfiguration:(BugsnagConfiguration *)config {

diff --git a/Bugsnag/Bugsnag+Private.h b/Bugsnag/Bugsnag+Private.h
@@ -8,16 +8,17 @@
 
 #import <Bugsnag/Bugsnag.h>
 
+#import "BSGDefines.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface Bugsnag ()
 
 #pragma mark Methods
 
 + (void)purge;
 
-+ (void)removeOnBreadcrumbBlock:(BugsnagOnBreadcrumbBlock)block;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Bugsnag/Bugsnag.m b/Bugsnag/Bugsnag.m
@@ -35,6 +35,7 @@
 
 static BugsnagClient *bsg_g_bugsnag_client = NULL;
 
+BSG_OBJC_DIRECT_MEMBERS
 @implementation Bugsnag
 
 + (BugsnagClient *_Nonnull)start {

diff --git a/Bugsnag/BugsnagSessionTracker.h b/Bugsnag/BugsnagSessionTracker.h
@@ -15,6 +15,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BugsnagSessionTracker : NSObject
 
 /**
@@ -41,21 +42,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)startNewSessionIfAutoCaptureEnabled;
 
-/**
- Handle the app foregrounding event. If more than 30s has elapsed since being
- sent to the background, records a new session if session auto-capture is
- enabled.
- Must be called from the main thread.
- */
-- (void)handleAppForegroundEvent;
-
-/**
- Handle the app backgrounding event. Tracks time between foreground and
- background to determine when to automatically record a session.
- Must be called from the main thread.
- */
-- (void)handleAppBackgroundEvent;
-
 /**
  Handle some variation of Bugsnag.notify() being called.
  Increments the number of handled or unhandled errors recorded for the current session, if
@@ -79,4 +65,23 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface BugsnagSessionTracker (/* not objc_direct */)
+
+/**
+ Handle the app foregrounding event. If more than 30s has elapsed since being
+ sent to the background, records a new session if session auto-capture is
+ enabled.
+ Must be called from the main thread.
+ */
+- (void)handleAppForegroundEvent;
+
+/**
+ Handle the app backgrounding event. Tracks time between foreground and
+ background to determine when to automatically record a session.
+ Must be called from the main thread.
+ */
+- (void)handleAppBackgroundEvent;
+
+@end
+
 NS_ASSUME_NONNULL_END
diff --git a/Bugsnag/BugsnagSessionTracker.m b/Bugsnag/BugsnagSessionTracker.m
@@ -27,13 +27,15 @@
  */
 static NSTimeInterval const BSGNewSessionBackgroundDuration = 30;
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BugsnagSessionTracker ()
 @property (strong, nonatomic) BugsnagConfiguration *config;
 @property (weak, nonatomic) BugsnagClient *client;
 @property (strong, nonatomic) NSDate *backgroundStartTime;
 @property (nonatomic) NSMutableDictionary *extraRuntimeInfo;
 @end
 
+BSG_OBJC_DIRECT_MEMBERS
 @implementation BugsnagSessionTracker
 
 - (instancetype)initWithConfig:(BugsnagConfiguration *)config client:(BugsnagClient *)client {

diff --git a/Bugsnag/BugsnagSystemState.h b/Bugsnag/BugsnagSystemState.h
@@ -10,6 +10,7 @@
 
 #import <Bugsnag/BugsnagConfiguration.h>
 
+#import "BSGDefines.h"
 #import "BSGKeys.h"
 
 #define SYSTEMSTATE_KEY_APP @"app"
@@ -19,6 +20,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BugsnagSystemState : NSObject
 
 @property(readonly,nonatomic) NSDictionary *lastLaunchState;

diff --git a/Bugsnag/BugsnagSystemState.m b/Bugsnag/BugsnagSystemState.m
@@ -106,6 +106,7 @@ id blankIfNil(id value) {
     return dictionary;
 }
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BugsnagSystemState ()
 
 @property(readwrite,atomic) NSDictionary *currentLaunchState;
@@ -114,6 +115,7 @@ @interface BugsnagSystemState ()
 
 @end
 
+BSG_OBJC_DIRECT_MEMBERS
 @implementation BugsnagSystemState
 
 - (instancetype)initWithConfiguration:(BugsnagConfiguration *)config {

diff --git a/Bugsnag/Client/BugsnagClient+Private.h b/Bugsnag/Client/BugsnagClient+Private.h
@@ -6,6 +6,7 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
+#import "BSGDefines.h"
 #import "BugsnagInternals.h"
 
 @class BSGAppHangDetector;
@@ -21,6 +22,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BugsnagClient ()
 
 #pragma mark Properties

diff --git a/Bugsnag/Client/BugsnagClient.m b/Bugsnag/Client/BugsnagClient.m
@@ -149,6 +149,7 @@ static void BSSerializeDataCrashHandler(const BSG_KSCrashReportWriter *writer) {
 
 // MARK: -
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BugsnagClient () <BSGBreadcrumbSink, BSGInternalErrorReporterDataSource>
 
 @property (nonatomic) BSGNotificationBreadcrumbs *notificationBreadcrumbs;
@@ -163,6 +164,14 @@ @interface BugsnagClient () <BSGBreadcrumbSink, BSGInternalErrorReporterDataSour
 
 @end
 
+@interface BugsnagClient (/* not objc_direct */)
+
+- (void)appLaunchTimerFired:(NSTimer *)timer;
+
+- (void)applicationWillTerminate:(NSNotification *)notification;
+
+@end
+
 #if BSG_HAVE_APP_HANG_DETECTION
 @interface BugsnagClient () <BSGAppHangDetectorDelegate>
 @end
@@ -174,6 +183,7 @@ @interface BugsnagClient () <BSGAppHangDetectorDelegate>
 __attribute__((annotate("oclint:suppress[long class]")))
 __attribute__((annotate("oclint:suppress[too many methods]")))
 #endif
+BSG_OBJC_DIRECT_MEMBERS
 @implementation BugsnagClient
 
 - (instancetype)initWithConfiguration:(BugsnagConfiguration *)configuration {

diff --git a/Bugsnag/Configuration/BugsnagConfiguration+Private.h b/Bugsnag/Configuration/BugsnagConfiguration+Private.h
@@ -6,12 +6,14 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
+#import "BSGDefines.h"
 #import "BugsnagInternals.h"
 
 @class BugsnagNotifier;
 
 NS_ASSUME_NONNULL_BEGIN
 
+BSG_OBJC_DIRECT_MEMBERS
 @interface BugsnagConfiguration ()
 
 #pragma mark Initializers
@@ -50,4 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface BugsnagConfiguration (/* not objc_direct */) <NSCopying>
+@end
+
 NS_ASSUME_NONNULL_END
diff --git a/Bugsnag/Configuration/BugsnagConfiguration.m b/Bugsnag/Configuration/BugsnagConfiguration.m
@@ -45,6 +45,7 @@
 // MARK: - BugsnagConfiguration
 // =============================================================================
 
+BSG_OBJC_DIRECT_MEMBERS
 @implementation BugsnagConfiguration
 
 + (instancetype _Nonnull)loadConfig {

diff --git a/Bugsnag/Delivery/BSGConnectivity.h b/Bugsnag/Delivery/BSGConnectivity.h
@@ -45,6 +45,7 @@ typedef void (^BSGConnectivityChangeBlock)(BOOL connected, NSString *typeDescrip
  * Monitors network connectivity using SCNetworkReachability callbacks,
  * providing a customizable callback block invoked when connectivity changes.
  */
+BSG_OBJC_DIRECT_MEMBERS
 @interface BSGConnectivity : NSObject
 
 /**

diff --git a/Bugsnag/Delivery/BSGEventUploadFileOperation.h b/Bugsnag/Delivery/BSGEventUploadFileOperation.h
@@ -8,11 +8,14 @@
 
 #import "BSGEventUploadOperation.h"
 
+#import "BSGDefines.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  * A concrete operation class for uploading an event that is stored on disk.
  */
+BSG_OBJC_DIRECT_MEMBERS
 @interface BSGEventUploadFileOperation : BSGEventUploadOperation
 
 - (instancetype)initWithFile:(NSString *)file delegate:(id<BSGEventUploadOperationDelegate>)delegate;