fix: Remove exposing var and let macros

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCore.h

@@ -41,7 +41,6 @@
 #import <OneSignalCore/OneSignalClient.h>
 #import <OneSignalCore/OneSignalCoreHelper.h>
 #import <OneSignalCore/OneSignalTrackFirebaseAnalytics.h>
-#import <OneSignalCore/OSMacros.h>
 #import <OneSignalCore/OSJSONHandling.h>
 #import <OneSignalCore/OSPrivacyConsentController.h>
 #import <OneSignalCore/OSDeviceUtils.h>

iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m

@@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import <Foundation/Foundation.h>
 #import "OneSignalAttachmentHandler.h"
 #import "OneSignalNotificationCategoryController.h"
+#import <OneSignalCore/OSMacros.h>
 
 @interface DirectDownloadDelegate : NSObject <NSURLSessionDataDelegate> {
     NSError* error;

iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalExtensionRequests.m

@@ -27,6 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import <Foundation/Foundation.h>
 #import "OneSignalExtensionRequests.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSRequestReceiveReceipts
 

iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m

@@ -26,6 +26,7 @@
  */
 
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
 #import "OneSignalNotificationServiceExtensionHandler.h"
 #import "OneSignalExtensionBadgeHandler.h"

iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m

@@ -28,6 +28,7 @@
 #import <Foundation/Foundation.h>
 #import "OneSignalReceiveReceiptsController.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OneSignalExtensionRequests.h"
 
 @implementation OneSignalReceiveReceiptsController

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSDynamicTriggerController.m

@@ -30,6 +30,7 @@
 #import "OneSignalCommonDefines.h"
 #import "OSMessagingController.h"
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OSSessionManager.h"
 
 @interface OSDynamicTriggerController ()

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m

@@ -27,6 +27,7 @@
 
 #import "OSInAppMessageController.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import <OneSignalUser/OneSignalUser.h>
 #import "OSInAppMessagingDefines.h"
 #import "OSInAppMessagingRequests.h"

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageMigrationController.m

@@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "OSInAppMessageMigrationController.h"
 #import "OSInAppMessagingDefines.h"
 #import "OSInAppMessageInternal.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageMigrationController
 

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m

@@ -29,6 +29,7 @@
 #import "UIApplication+OneSignal.h"
 #import "NSDateFormatter+OneSignal.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OSInAppMessageClickResult.h"
 #import "OSInAppMessageClickEvent.h"
 #import "OSInAppMessageController.h"

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m

@@ -27,6 +27,7 @@
 
 #import "OSTriggerController.h"
 #import "OSInAppMessagingDefines.h"
+#import <OneSignalCore/OSMacros.h>
 
 @interface OSTriggerController ()
 @property (strong, nonatomic, nonnull) NSMutableDictionary<NSString *, id> *triggers;

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageBridgeEvent.m

@@ -27,6 +27,7 @@
 
 #import "OSInAppMessageBridgeEvent.h"
 #import "OSInAppMessageClickResult.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageBridgeEvent
 

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickEvent.m

@@ -27,6 +27,7 @@
 
 
 #import "OSInAppMessageClickEvent.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageClickEvent
 

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickResult.m

@@ -28,6 +28,7 @@
 #import "OSInAppMessageClickResult.h"
 #import "OSInAppMessagePushPrompt.h"
 #import "OSInAppMessageLocationPrompt.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageClickResult
 

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageDisplayStats.m

@@ -26,6 +26,7 @@
 */
 
 #import "OSInAppMessageDisplayStats.h"
+#import <OneSignalCore/OSMacros.h>
 
 @interface OSInAppMessageDisplayStats ()
 @property (nonatomic, readwrite) BOOL redisplayEnabled;

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageInternal.m

@@ -28,6 +28,7 @@
 #import "OSInAppMessageInternal.h"
 #import "NSDateFormatter+OneSignal.h"
 #import "OneSignalCommonDefines.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessage
 

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageLocationPrompt.m

@@ -29,6 +29,7 @@
 #import "OSInAppMessageLocationPrompt.h"
 #import <OneSignalLocation/OneSignalLocationManager.h>
 #import <OneSignalCore/OneSignalLog.h>
+#import <OneSignalCore/OSMacros.h>
 
 //@interface OneSignalLocation ()
 //

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessagePushPrompt.m

@@ -28,6 +28,7 @@
 #import "OSInAppMessagePushPrompt.h"
 #import "OneSignalInAppMessages.h"
 #import <OneSignalNotifications/OneSignalNotifications.h>
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessagePushPrompt
 

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageTag.m

@@ -26,6 +26,7 @@
 */
 
 #import "OSInAppMessageTag.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageTag
 

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSTrigger.m

@@ -26,6 +26,7 @@
  */
 
 #import "OSTrigger.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSTrigger
 

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m

@@ -26,6 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 #import <Foundation/Foundation.h>
 #import "OSInAppMessagingRequests.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSRequestGetInAppMessages
 - (NSString *)description {

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageView.m

@@ -29,6 +29,7 @@
 #import <WebKit/WebKit.h>
 #import "OSInAppMessageClickResult.h"
 #import <OneSignalUser/OneSignalUser.h>
+#import <OneSignalCore/OSMacros.h>
 
 @interface OSInAppMessageView () <UIScrollViewDelegate, WKUIDelegate, WKNavigationDelegate>
 

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageViewController.m

@@ -30,6 +30,7 @@
 #import "OSInAppMessageController.h"
 #import "OSInAppMessageBridgeEvent.h"
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OSSessionManager.h"
 
 #define HIGHEST_CONSTRAINT_PRIORITY 999.0f

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OneSignalWebView.m

@@ -28,7 +28,7 @@
 #import <UIKit/UIKit.h>
 #import "OneSignalWebView.h"
 #import <OneSignalCore/OneSignalCore.h>
-
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OneSignalWebView
 

iOS_SDK/OneSignalSDK/OneSignalLocation/OneSignalLocationManager.m

@@ -29,6 +29,7 @@
 #import <CoreLocation/CoreLocation.h>
 #import "OneSignalLocationManager.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import <OneSignalUser/OneSignalUser-Swift.h>
 
 @implementation OneSignalLocationManager

iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m

@@ -35,6 +35,7 @@
 #import "SwizzlingForwarder.h"
 #import "OSNotificationsManager.h"
 #import <objc/runtime.h>
+#import <OneSignalCore/OSMacros.h>
 
 // This class hooks into the UIApplicationDelegate selectors to receive iOS 9 and older events.
 //   - UNUserNotificationCenter is used for iOS 10

iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m

@@ -33,6 +33,7 @@
 #import "UIApplicationDelegate+OneSignalNotifications.h"
 #import "OSNotificationsManager.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import <objc/runtime.h>
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundeclared-selector"

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m

@@ -27,6 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "OSNotificationsManager.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import <UIKit/UIKit.h>
 #import <UserNotifications/UserNotifications.h>
 #import "OSNotification+OneSignal.h"

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m

@@ -27,6 +27,7 @@
 
 #import "OSPermission.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OSNotificationsManager.h"
 
 @implementation OSPermissionStateInternal

iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSInAppMessageOutcome.m

@@ -26,6 +26,7 @@
  */
 
 #import "OSInAppMessageOutcome.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageOutcome
 

iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m

@@ -26,6 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 #import "OneSignalOutcomes.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSOutcomes
 

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSChannelTracker.m

@@ -27,6 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import <Foundation/Foundation.h>
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OSChannelTracker.h"
 #import "OSIndirectInfluence.h"
 

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSInAppMessageTracker.m

@@ -30,6 +30,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "OSIndirectInfluence.h"
 #import "OSInAppMessageTracker.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 
 @interface OSChannelTracker ()
 

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/model/OSIndirectInfluence.m

@@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import <Foundation/Foundation.h>
 #import "OSIndirectInfluence.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 
 @interface OSIndirectInfluence ()
 

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Model/V1/OSOutcomeEvent.m

@@ -27,6 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "OSOutcomeEvent.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSOutcomeEvent
 

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomeEventsRepository.m

@@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import <Foundation/Foundation.h>
 #import "OSCachedUniqueOutcome.h"
 #import "OSOutcomeEventsRepository.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSOutcomeEventsRepository
 

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomesRequests.m

@@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 
 #import "OSOutcomesRequests.h"
-
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSRequestSendOutcomesV1ToServer
 NSString * const APP_ID = @"app_id";

iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m

@@ -26,6 +26,7 @@
  */
 #import <UIKit/UIKit.h>
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OneSignalFramework.h"
 #import "OSAttributedFocusTimeProcessor.h"
 #import <OneSignalUser/OneSignalUser.h>

iOS_SDK/OneSignalSDK/Source/OSFocusRequests.m

@@ -27,6 +27,7 @@
 
 #import <Foundation/Foundation.h>
 #import "OSFocusRequests.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSRequestOnFocus
 

iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m

@@ -27,6 +27,7 @@
 #import <UIKit/UIKit.h>
 #import <OneSignalCore/OneSignalCore.h>
 #import <OneSignalOSCore/OneSignalOSCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OSUnattributedFocusTimeProcessor.h"
 #import <OneSignalUser/OneSignalUser.h>
 

iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h

@@ -49,6 +49,10 @@
 #import <OneSignalOSCore/OneSignalOSCore.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 
+// Forward declarations for Objective-C++ compatibility
+@protocol OSUser;
+@protocol OSLiveActivities;
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wstrict-prototypes"
 #pragma clang diagnostic ignored "-Wnullability-completeness"

iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m

@@ -31,6 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "OneSignalCommonDefines.h"
 #import "OneSignalTracker.h"
 #import <OneSignalLocation/OneSignalLocationManager.h>
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OneSignalLifecycleObserver
 

iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m

@@ -31,6 +31,7 @@
 #import "OneSignalTracker.h"
 #import "OneSignalWebView.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
 #import "OSFocusTimeProcessorFactory.h"
 #import "OSFocusCallParams.h"