Skip to content

Commit 8fcb316

Browse files
fhboswellfhboswell
committed
merge in 5.0.0
2 parents 2da1379 + c80efe8 commit 8fcb316

File tree

382 files changed

+58347
-2539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

382 files changed

+58347
-2539
lines changed

‎MIGRATION_GUIDE.md‎

Lines changed: 689 additions & 0 deletions
Large diffs are not rendered by default.

‎OneSignal.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OneSignal"
3-
s.version = "3.11.2"
3+
s.version = "5.0.0-alpha-01"
44
s.summary = "OneSignal push notification library for mobile apps."
55
s.homepage = "https://onesignal.com"
66
s.license = { :type => 'MIT', :file => 'LICENSE' }

‎OneSignalXCFramework.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OneSignalXCFramework"
3-
s.version = "3.11.2"
3+
s.version = "5.0.0-alpha-01"
44
s.summary = "OneSignal push notification library for mobile apps."
55
s.homepage = "https://onesignal.com"
66
s.license = { :type => 'MIT', :file => 'LICENSE' }

‎Package.swift‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,38 +76,38 @@ let package = Package(
7676
),
7777
.binaryTarget(
7878
name: "OneSignalFramework",
79-
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.11.2/OneSignalFramework.xcframework.zip",
80-
checksum: "e9cf7ebef15ab8757e6e9c95d359998f018f4de381944f4cc62bc4c25d1cdb9d"
79+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-alpha-01/OneSignalFramework.xcframework.zip",
80+
checksum: "4f50e9587156902b31d7141860252585203b695d1021e6e4ab0043e06a155a9a"
8181
),
8282
.binaryTarget(
8383
name: "OneSignalUser",
84-
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.11.2/OneSignalUser.xcframework.zip",
85-
checksum: "6378ad0fdba2e485274b87b192d0c6419f37e92bd33d9a2f7993b9c5e137b94f"
84+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-alpha-01/OneSignalUser.xcframework.zip",
85+
checksum: "7765bba3068471b937f334f430c52b3db896454804374b4f5f9e7ae318215cb2"
8686
),
8787
.binaryTarget(
8888
name: "OneSignalNotifications",
89-
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.11.2/OneSignalNotifications.xcframework.zip",
90-
checksum: "6378ad0fdba2e485274b87b192d0c6419f37e92bd33d9a2f7993b9c5e137b94f"
89+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-alpha-01/OneSignalNotifications.xcframework.zip",
90+
checksum: "d0dfc93d949bba2e93b200ff21ec495e0cc26734439502f4f9328c5a021856d8"
9191
),
9292
.binaryTarget(
9393
name: "OneSignalExtension",
94-
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.11.2/OneSignalExtension.xcframework.zip",
95-
checksum: "1725ed62c9a3630caccb04e6c52db02348719428e6a3eca6b1fec8ee35828162"
94+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-alpha-01/OneSignalExtension.xcframework.zip",
95+
checksum: "4c5f46b7e2c05cc92e2dea080a8620909d6bf3873bc1bb0580831a1ed0084cb5"
9696
),
9797
.binaryTarget(
9898
name: "OneSignalOutcomes",
99-
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.11.2/OneSignalOutcomes.xcframework.zip",
100-
checksum: "d1345bda87e3f0b4f50cc4f31de7c7f8a6be38e7b768d7ce4e599dc6e6f467ba"
99+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-alpha-01/OneSignalOutcomes.xcframework.zip",
100+
checksum: "f34e8b283a3c5db469164d5752f11cc9c464113bf04aa2531517241f8596cb0d"
101101
),
102102
.binaryTarget(
103103
name: "OneSignalOSCore",
104-
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.11.2/OneSignalOSCore.xcframework.zip",
105-
checksum: "6378ad0fdba2e485274b87b192d0c6419f37e92bd33d9a2f7993b9c5e137b94f"
104+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-alpha-01/OneSignalOSCore.xcframework.zip",
105+
checksum: "bb4e322248b6c9c93eb478fef44416417aaf6968333702dc9e5e9dcee07e614f"
106106
),
107107
.binaryTarget(
108108
name: "OneSignalCore",
109-
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.11.2/OneSignalCore.xcframework.zip",
110-
checksum: "6378ad0fdba2e485274b87b192d0c6419f37e92bd33d9a2f7993b9c5e137b94f"
109+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-alpha-01/OneSignalCore.xcframework.zip",
110+
checksum: "9649d2269722cf60b03f9c55dd9af5f65b1933b28852e9ed1a6bbb202dcb1150"
111111
)
112112
]
113113
)

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
105105
return YES;
106106
}
107107

108-
#define ONESIGNAL_APP_ID_DEFAULT @"YOUR_APP_ID_HERE"
108+
#define ONESIGNAL_APP_ID_DEFAULT @"77e32082-ea27-42e3-a898-c72e141824ef"
109109
#define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"YOUR_APP_ID_HERE"
110110

111111
+ (NSString*)getOneSignalAppId {

‎iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
3C2C7DC6288E00AA0020F9AE /* UserModelObjcTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2C7DC5288E00AA0020F9AE /* UserModelObjcTests.m */; };
6969
3C2C7DC8288F3C020020F9AE /* OSSubscriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */; };
7070
3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */; };
71+
3C44673E296D099D0039A49E /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */; };
72+
3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */ = {isa = PBXBuildFile; fileRef = 912411FC1E73342200E41FD7 /* OneSignalMobileProvision.h */; settings = {ATTRIBUTES = (Public, ); }; };
7173
3C448B9D2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h */; };
7274
3C448B9E2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */; };
7375
3C448B9F2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */; };
@@ -182,10 +184,6 @@
182184
912412221E73342200E41FD7 /* OneSignalLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FB1E73342200E41FD7 /* OneSignalLocation.m */; };
183185
912412231E73342200E41FD7 /* OneSignalLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FB1E73342200E41FD7 /* OneSignalLocation.m */; };
184186
912412241E73342200E41FD7 /* OneSignalLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FB1E73342200E41FD7 /* OneSignalLocation.m */; };
185-
912412251E73342200E41FD7 /* OneSignalMobileProvision.h in Headers */ = {isa = PBXBuildFile; fileRef = 912411FC1E73342200E41FD7 /* OneSignalMobileProvision.h */; };
186-
912412261E73342200E41FD7 /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */; };
187-
912412271E73342200E41FD7 /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */; };
188-
912412281E73342200E41FD7 /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */; };
189187
912412311E73342200E41FD7 /* OneSignalTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 912412021E73342200E41FD7 /* OneSignalTracker.h */; };
190188
912412321E73342200E41FD7 /* OneSignalTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 912412031E73342200E41FD7 /* OneSignalTracker.m */; };
191189
912412331E73342200E41FD7 /* OneSignalTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 912412031E73342200E41FD7 /* OneSignalTracker.m */; };
@@ -1447,8 +1445,6 @@
14471445
912411F91E73342200E41FD7 /* OneSignalJailbreakDetection.m */,
14481446
912411FA1E73342200E41FD7 /* OneSignalLocation.h */,
14491447
912411FB1E73342200E41FD7 /* OneSignalLocation.m */,
1450-
912411FC1E73342200E41FD7 /* OneSignalMobileProvision.h */,
1451-
912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */,
14521448
912412021E73342200E41FD7 /* OneSignalTracker.h */,
14531449
912412031E73342200E41FD7 /* OneSignalTracker.m */,
14541450
912412041E73342200E41FD7 /* OneSignalTrackIAP.h */,
@@ -1646,6 +1642,8 @@
16461642
CA70E3382023F24500019273 /* OneSignalCommonDefines.h */,
16471643
7AD8DDE8234BD3CF00747A8A /* OneSignalUserDefaults.h */,
16481644
7AD8DDE6234BD3BE00747A8A /* OneSignalUserDefaults.m */,
1645+
912411FC1E73342200E41FD7 /* OneSignalMobileProvision.h */,
1646+
912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */,
16491647
4529DF0A1FA932AC00CEAB1D /* OneSignalTrackFirebaseAnalytics.h */,
16501648
4529DF0B1FA932AC00CEAB1D /* OneSignalTrackFirebaseAnalytics.m */,
16511649
DE7D1831270279D9002D3A5D /* OSNotificationClasses.h */,
@@ -1998,7 +1996,6 @@
19981996
A63E9E3F26742C1400EA273E /* LanguageProvider.h in Headers */,
19991997
A66239952686612F00D52FD8 /* OneSignalFramework.h in Headers */,
20001998
7A93269325AF4E6700BBEC27 /* OSPendingCallbacks.h in Headers */,
2001-
912412251E73342200E41FD7 /* OneSignalMobileProvision.h in Headers */,
20021999
A63E9E3E26742C1000EA273E /* LanguageContext.h in Headers */,
20032000
CA4742E4218B8FF30020DC8C /* OSTriggerController.h in Headers */,
20042001
DE7D18EC2703B5AA002D3A5D /* OSInAppMessagingRequests.h in Headers */,
@@ -2072,6 +2069,7 @@
20722069
3CE8CC4E2911ADD1000DB0D3 /* OSDeviceUtils.h in Headers */,
20732070
3C47A974292642B100312125 /* OneSignalConfigManager.h in Headers */,
20742071
DE7D183627027AA0002D3A5D /* OneSignalLog.h in Headers */,
2072+
3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */,
20752073
DE7D182D270273B0002D3A5D /* OSNotification.h in Headers */,
20762074
DE7D183F27027F62002D3A5D /* NSString+OneSignal.h in Headers */,
20772075
);
@@ -2582,7 +2580,6 @@
25822580
9D3300F523145AF3000F0A83 /* OneSignalViewHelper.m in Sources */,
25832581
9124123E1E73342200E41FD7 /* UIApplicationDelegate+OneSignal.m in Sources */,
25842582
CA47439E2190FEA80020DC8C /* OSTrigger.m in Sources */,
2585-
912412261E73342200E41FD7 /* OneSignalMobileProvision.m in Sources */,
25862583
CAB4112920852E48005A70D1 /* DelayedConsentInitializationParameters.m in Sources */,
25872584
CA1A6E7020DC2E73001C41B9 /* OneSignalDialogRequest.m in Sources */,
25882585
912412321E73342200E41FD7 /* OneSignalTracker.m in Sources */,
@@ -2658,7 +2655,6 @@
26582655
CA1A6E7120DC2E73001C41B9 /* OneSignalDialogRequest.m in Sources */,
26592656
CA4742E6218B8FF30020DC8C /* OSTriggerController.m in Sources */,
26602657
CAB269E121B2038B00F8A43C /* OSInAppMessageBridgeEvent.m in Sources */,
2661-
912412271E73342200E41FD7 /* OneSignalMobileProvision.m in Sources */,
26622658
912412331E73342200E41FD7 /* OneSignalTracker.m in Sources */,
26632659
DE367CC824EEF2BE00165207 /* OSInAppMessagePage.m in Sources */,
26642660
DE7D18EF2703B5B9002D3A5D /* OSInAppMessagingRequests.m in Sources */,
@@ -2765,7 +2761,6 @@
27652761
03CCCC852835F291004BF794 /* UIApplicationDelegateSwizzlingTests.m in Sources */,
27662762
4529DEEA1FA8360C00CEAB1D /* UIApplicationOverrider.m in Sources */,
27672763
DEC08B022947D4E900C81DA3 /* OneSignalSwiftInterface.swift in Sources */,
2768-
912412281E73342200E41FD7 /* OneSignalMobileProvision.m in Sources */,
27692764
7A93269E25AF4F0300BBEC27 /* OSPendingCallbacks.m in Sources */,
27702765
7AECE59823674AB700537907 /* OSUnattributedFocusTimeProcessor.m in Sources */,
27712766
7A5A818224897693002E07C8 /* MigrationTests.m in Sources */,
@@ -2817,6 +2812,7 @@
28172812
DEF784642912FA5100A1F3A5 /* OSDialogInstanceManager.m in Sources */,
28182813
DE7D183B27027EFC002D3A5D /* NSURL+OneSignal.m in Sources */,
28192814
DE7D186B270374EE002D3A5D /* OneSignalRequest.m in Sources */,
2815+
3C44673E296D099D0039A49E /* OneSignalMobileProvision.m in Sources */,
28202816
DEF78492291479B200A1F3A5 /* OneSignalSelectorHelpers.m in Sources */,
28212817
DE7D182B27027376002D3A5D /* OSNotification.m in Sources */,
28222818
DE7D187A27037A26002D3A5D /* OneSignalCoreHelper.m in Sources */,

‎iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
// "*" in comment line ending comment means the string value has not been changed
4747
// App
4848

49-
#define ONESIGNAL_VERSION @"031102"
49+
#define ONESIGNAL_VERSION @"050000-alpha-01"
5050

5151
#define OSUD_APP_ID @"GT_APP_ID" // * OSUD_APP_ID
5252
#define OSUD_REGISTERED_WITH_APPLE @"GT_REGISTERED_WITH_APPLE" // * OSUD_REGISTERED_WITH_APPLE

‎iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCore.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@
5252
#import <OneSignalCore/OneSignalSelectorHelpers.h>
5353
#import <OneSignalCore/OneSignalConfigManager.h>
5454
#import <OneSignalCore/OSRemoteParamController.h>
55-
55+
#import <OneSignalCore/OneSignalMobileProvision.h>

‎iOS_SDK/OneSignalSDK/Source/OneSignalMobileProvision.h‎ renamed to ‎iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalMobileProvision.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright (c) 2013 The Blindsight Corporation. All rights reserved.
77
// Released under the BSD 2-Clause License (see LICENSE)
88

9-
typedef NS_ENUM(NSInteger, UIApplicationReleaseMode) {
9+
typedef NS_ENUM(NSInteger, OSUIApplicationReleaseMode) {
1010
UIApplicationReleaseUnknown,
1111
UIApplicationReleaseDev,
1212
UIApplicationReleaseAdHoc,
@@ -18,6 +18,6 @@ typedef NS_ENUM(NSInteger, UIApplicationReleaseMode) {
1818

1919
@interface OneSignalMobileProvision : NSObject
2020

21-
+ (UIApplicationReleaseMode) releaseMode;
21+
+ (OSUIApplicationReleaseMode) releaseMode;
2222

2323
@end

‎iOS_SDK/OneSignalSDK/Source/OneSignalMobileProvision.m‎ renamed to ‎iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalMobileProvision.m‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55
// Created by kaolin fire on 2013-06-24.
66
// Copyright (c) 2013 The Blindsight Corporation. All rights reserved.
77
// Released under the BSD 2-Clause License (see LICENSE)
8-
#import <UIKit/UIKit.h>
98
#import <Foundation/Foundation.h>
109

1110
#import "OneSignalMobileProvision.h"
12-
#import "TargetConditionals.h"
13-
#import "OneSignalFramework.h"
14-
#import "OneSignalInternal.h"
11+
#import "OneSignalLog.h"
1512

1613
@implementation OneSignalMobileProvision
1714

@@ -86,7 +83,7 @@ + (void)logInvalidProvisionError:(NSString *)message {
8683
[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:message];
8784
}
8885

89-
+ (UIApplicationReleaseMode) releaseMode {
86+
+ (OSUIApplicationReleaseMode) releaseMode {
9087
NSDictionary *entitlements = nil;
9188
NSDictionary *provision = [self getProvision];
9289
if (provision) {

0 commit comments

Comments
 (0)