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/OneSignalCore/Source/OneSignalCoreHelper.h

@@ -35,8 +35,6 @@
 + (void)dispatch_async_on_main_queue:(void(^)())block;
 + (void)performSelector:(SEL)aSelector onMainThreadOnObject:(id)targetObj withObject:(id)anArgument afterDelay:(NSTimeInterval)delay;
 
-+ (NSString*)hashUsingSha1:(NSString*)string;
-+ (NSString*)hashUsingMD5:(NSString*)string;
 + (NSString*)trimURLSpacing:(NSString*)url;
 + (NSString*)parseNSErrorAsJsonString:(NSError*)error;
 + (BOOL)isOneSignalPayload:(NSDictionary *)payload;

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.m

@@ -32,129 +32,9 @@
 extern "C" {
 #endif
 
-#define CC_DIGEST_DEPRECATION_WARNING                                                                                          \
-    "This function is cryptographically broken and should not be used in security contexts. Clients should migrate to SHA256 (or stronger)."
-
-/*
- * For compatibility with legacy implementations, the *Init(), *Update(),
- * and *Final() functions declared here *always* return a value of 1 (one).
- * This corresponds to "success" in the similar openssl implementations.
- * There are no errors of any kind which can be, or are, reported here,
- * so you can safely ignore the return values of all of these functions
- * if you are implementing new code.
- *
- * The one-shot functions (CC_MD2(), CC_SHA1(), etc.) perform digest
- * calculation and place the result in the caller-supplied buffer
- * indicated by the md parameter. They return the md parameter.
- * Unlike the opensssl counterparts, these one-shot functions require
- * a non-NULL md pointer. Passing in NULL for the md parameter
- * results in a NULL return and no digest calculation.
- */
-
 typedef uint32_t CC_LONG;       /* 32 bit unsigned integer */
 typedef uint64_t CC_LONG64;     /* 64 bit unsigned integer */
 
-/*** MD2 ***/
-
-#define CC_MD2_DIGEST_LENGTH    16          /* digest length in bytes */
-#define CC_MD2_BLOCK_BYTES      64          /* block size in bytes */
-#define CC_MD2_BLOCK_LONG       (CC_MD2_BLOCK_BYTES / sizeof(CC_LONG))
-
-typedef struct CC_MD2state_st
-{
-    int num;
-    unsigned char data[CC_MD2_DIGEST_LENGTH];
-    CC_LONG cksm[CC_MD2_BLOCK_LONG];
-    CC_LONG state[CC_MD2_BLOCK_LONG];
-} CC_MD2_CTX;
-
-extern int CC_MD2_Init(CC_MD2_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD2_Update(CC_MD2_CTX *c, const void *data, CC_LONG len)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD2_Final(unsigned char *md, CC_MD2_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern unsigned char *CC_MD2(const void *data, CC_LONG len, unsigned char *md)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-/*** MD4 ***/
-
-#define CC_MD4_DIGEST_LENGTH    16          /* digest length in bytes */
-#define CC_MD4_BLOCK_BYTES      64          /* block size in bytes */
-#define CC_MD4_BLOCK_LONG       (CC_MD4_BLOCK_BYTES / sizeof(CC_LONG))
-
-typedef struct CC_MD4state_st
-{
-    CC_LONG A,B,C,D;
-    CC_LONG Nl,Nh;
-    CC_LONG data[CC_MD4_BLOCK_LONG];
-    uint32_t num;
-} CC_MD4_CTX;
-
-extern int CC_MD4_Init(CC_MD4_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD4_Update(CC_MD4_CTX *c, const void *data, CC_LONG len)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD4_Final(unsigned char *md, CC_MD4_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern unsigned char *CC_MD4(const void *data, CC_LONG len, unsigned char *md)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-
-/*** MD5 ***/
-
-#define CC_MD5_DIGEST_LENGTH    16          /* digest length in bytes */
-#define CC_MD5_BLOCK_BYTES      64          /* block size in bytes */
-#define CC_MD5_BLOCK_LONG       (CC_MD5_BLOCK_BYTES / sizeof(CC_LONG))
-
-typedef struct CC_MD5state_st
-{
-    CC_LONG A,B,C,D;
-    CC_LONG Nl,Nh;
-    CC_LONG data[CC_MD5_BLOCK_LONG];
-    int num;
-} CC_MD5_CTX;
-
-extern int CC_MD5_Init(CC_MD5_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD5_Update(CC_MD5_CTX *c, const void *data, CC_LONG len)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD5_Final(unsigned char *md, CC_MD5_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern unsigned char *CC_MD5(const void *data, CC_LONG len, unsigned char *md)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-/*** SHA1 ***/
-
-#define CC_SHA1_DIGEST_LENGTH   20          /* digest length in bytes */
-#define CC_SHA1_BLOCK_BYTES     64          /* block size in bytes */
-#define CC_SHA1_BLOCK_LONG      (CC_SHA1_BLOCK_BYTES / sizeof(CC_LONG))
-
-typedef struct CC_SHA1state_st
-{
-    CC_LONG h0,h1,h2,h3,h4;
-    CC_LONG Nl,Nh;
-    CC_LONG data[CC_SHA1_BLOCK_LONG];
-    int num;
-} CC_SHA1_CTX;
-
-extern int CC_SHA1_Init(CC_SHA1_CTX *c);
-
-extern int CC_SHA1_Update(CC_SHA1_CTX *c, const void *data, CC_LONG len);
-
-extern int CC_SHA1_Final(unsigned char *md, CC_SHA1_CTX *c);
-
-extern unsigned char *CC_SHA1(const void *data, CC_LONG len, unsigned char *md);
-
 /*** SHA224 ***/
 #define CC_SHA224_DIGEST_LENGTH     28          /* digest length in bytes */
 #define CC_SHA224_BLOCK_BYTES       64          /* block size in bytes */
@@ -258,26 +138,6 @@ + (void)performSelector:(SEL)aSelector onMainThreadOnObject:(nullable id)targetO
     }];
 }
 
-+ (NSString*)hashUsingSha1:(NSString*)string {
-    const char *cstr = [string UTF8String];
-    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
-    CC_SHA1(cstr, (CC_LONG)strlen(cstr), digest);
-    NSMutableString *output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
-    for (int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
-        [output appendFormat:@"%02x", digest[i]];
-    return output;
-}
-
-+ (NSString*)hashUsingMD5:(NSString*)string {
-    const char *cstr = [string UTF8String];
-    uint8_t digest[CC_MD5_DIGEST_LENGTH];
-    CC_MD5(cstr, (CC_LONG)strlen(cstr), digest);
-    NSMutableString *output = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2];
-    for (int i = 0; i < CC_MD5_DIGEST_LENGTH; i++)
-        [output appendFormat:@"%02x", digest[i]];
-    return output;
-}
-
 + (NSString*)trimURLSpacing:(NSString*)url {
     if (!url || [url isEqual:[NSNull null]]) {
         return nil;

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