Skip to content

Commit 7e03af4

Browse files
emawbyemawby
authored
Merge pull request #1273 from OneSignal/user_model/modularize_location
User model modularize Location and InAppMessages
2 parents bbb4712 + 0dc4f15 commit 7e03af4

File tree

295 files changed

+29705
-3951
lines changed

Some content is hidden

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

295 files changed

+29705
-3951
lines changed

‎OneSignal.podspec‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ Pod::Spec.new do |s|
2020
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_OSCore/OneSignalOSCore.xcframework'
2121
end
2222

23-
s.subspec 'OneSignalUser' do |ss|
24-
ss.dependency 'OneSignal/OneSignalCore'
25-
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_User/OneSignalUser.xcframework'
26-
end
27-
2823
s.subspec 'OneSignalOutcomes' do |ss|
2924
ss.dependency 'OneSignal/OneSignalCore'
3025
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
@@ -50,4 +45,31 @@ Pod::Spec.new do |s|
5045
ss.dependency 'OneSignal/OneSignalNotifications'
5146
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_User/OneSignalUser.xcframework'
5247
end
48+
49+
s.subspec 'OneSignalLocation' do |ss|
50+
ss.dependency 'OneSignal/OneSignalCore'
51+
ss.dependency 'OneSignal/OneSignalOSCore'
52+
ss.dependency 'OneSignal/OneSignalNotifications'
53+
ss.dependency 'OneSignal/OneSignalUser'
54+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Location/OneSignalLocation.xcframework'
55+
end
56+
57+
s.subspec 'OneSignalInAppMessages' do |ss|
58+
ss.dependency 'OneSignal/OneSignalCore'
59+
ss.dependency 'OneSignal/OneSignalOSCore'
60+
ss.dependency 'OneSignal/OneSignalOutcomes'
61+
ss.dependency 'OneSignal/OneSignalNotifications'
62+
ss.dependency 'OneSignal/OneSignalUser'
63+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_InAppMessages/OneSignalInAppMessages.xcframework'
64+
end
65+
66+
s.subspec 'OneSignal' do |ss|
67+
ss.dependency 'OneSignal/OneSignalCore'
68+
ss.dependency 'OneSignal/OneSignalOSCore'
69+
ss.dependency 'OneSignal/OneSignalOutcomes'
70+
ss.dependency 'OneSignal/OneSignalExtension'
71+
ss.dependency 'OneSignal/OneSignalNotifications'
72+
ss.dependency 'OneSignal/OneSignalUser'
73+
ss.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
74+
end
5375
end

‎OneSignalInAppMessagesWrapper/dummy.m‎

Whitespace-only changes.

‎OneSignalInAppMessagesWrapper/include/dummy.h‎

Whitespace-only changes.

‎OneSignalLocationWrapper/dummy.m‎

Whitespace-only changes.

‎OneSignalLocationWrapper/include/dummy.h‎

Whitespace-only changes.

‎OneSignalXCFramework.podspec‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,31 @@ Pod::Spec.new do |s|
4646
ss.dependency 'OneSignalXCFramework/OneSignalNotifications'
4747
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_User/OneSignalUser.xcframework'
4848
end
49-
end
50-
49+
50+
s.subspec 'OneSignalLocation' do |ss|
51+
ss.dependency 'OneSignalXCFramework/OneSignalCore'
52+
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
53+
ss.dependency 'OneSignalXCFramework/OneSignalNotifications'
54+
ss.dependency 'OneSignalXCFramework/OneSignalUser'
55+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Location/OneSignalLocation.xcframework'
56+
end
57+
58+
s.subspec 'OneSignalInAppMessages' do |ss|
59+
ss.dependency 'OneSignalXCFramework/OneSignalCore'
60+
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
61+
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
62+
ss.dependency 'OneSignalXCFramework/OneSignalNotifications'
63+
ss.dependency 'OneSignalXCFramework/OneSignalUser'
64+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_InAppMessages/OneSignalInAppMessages.xcframework'
65+
end
66+
67+
s.subspec 'OneSignal' do |ss|
68+
ss.dependency 'OneSignalXCFramework/OneSignalCore'
69+
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
70+
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
71+
ss.dependency 'OneSignalXCFramework/OneSignalExtension'
72+
ss.dependency 'OneSignalXCFramework/OneSignalNotifications'
73+
ss.dependency 'OneSignalXCFramework/OneSignalUser'
74+
ss.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
75+
end
76+
end

‎Package.swift‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ let package = Package(
99
.library(
1010
name: "OneSignalFramework",
1111
targets: ["OneSignalFrameworkWrapper"]),
12+
.library(
13+
name: "OneSignalInAppMessages",
14+
targets: ["OneSignalInAppMessagesWrapper"]),,
15+
.library(
16+
name: "OneSignalLocation",
17+
targets: ["OneSignalLocationWrapper"]),
1218
.library(
1319
name: "OneSignalExtension",
1420
targets: ["OneSignalExtensionWrapper"])
@@ -27,6 +33,29 @@ let package = Package(
2733
],
2834
path: "OneSignalFrameworkWrapper"
2935
),
36+
.target(
37+
name: "OneSignalInAppMessagesWrapper",
38+
dependencies: [
39+
"OneSignalInAppMessages",
40+
"OneSignalUser",
41+
"OneSignalNotifications",
42+
"OneSignalOutcomes",
43+
"OneSignalOSCore",
44+
"OneSignalCore"
45+
],
46+
path: "OneSignalInAppMessagesWrapper"
47+
),
48+
.target(
49+
name: "OneSignalLocationWrapper",
50+
dependencies: [
51+
"OneSignalLocation",
52+
"OneSignalUser",
53+
"OneSignalNotifications",
54+
"OneSignalOSCore",
55+
"OneSignalCore"
56+
],
57+
path: "OneSignalLocationWrapper"
58+
),
3059
.target(
3160
name: "OneSignalUserWrapper",
3261
dependencies: [
@@ -79,6 +108,16 @@ let package = Package(
79108
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalFramework.xcframework.zip",
80109
checksum: "c1a9a6d372fa8a2e4dfa077e74c6a5cdc523ce1005e58a05d888aec742f80d52"
81110
),
111+
.binaryTarget(
112+
name: "OneSignalInAppMessages",
113+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalInAppMessages.xcframework.zip",
114+
checksum: "needschecksum"
115+
),
116+
.binaryTarget(
117+
name: "OneSignalLocation",
118+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalLocation.xcframework.zip",
119+
checksum: "needschecksum"
120+
),
82121
.binaryTarget(
83122
name: "OneSignalUser",
84123
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/5.0.0-beta-04/OneSignalUser.xcframework.zip",

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
5858
_notificationDelegate = [OneSignalNotificationCenterDelegate new];
5959

6060
// OneSignal Init with app id and lauch options
61-
[OneSignal setLaunchURLsInApp:YES];
6261
[OneSignal setProvidesNotificationSettingsView:NO];
6362

6463
[OneSignal.InAppMessages addLifecycleListener:self];

‎iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
5656
_notificationDelegate = [OneSignalNotificationCenterDelegate new];
5757

5858
// OneSignal Init with app id and lauch options
59-
[OneSignal setLaunchURLsInApp:YES];
6059
[OneSignal setProvidesNotificationSettingsView:NO];
6160
[OneSignal initialize:[AppDelegate getOneSignalAppId] withLaunchOptions:launchOptions];
6261

‎iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
03432CDC1EBD426A0071FC48 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03432CDB1EBD426A0071FC48 /* CoreLocation.framework */; };
1110
3C448BA429381303002F96BC /* OneSignalNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C448BA329381303002F96BC /* OneSignalNotifications.framework */; };
1211
3C448BA529381303002F96BC /* OneSignalNotifications.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3C448BA329381303002F96BC /* OneSignalNotifications.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1312
4529DECC1FA7EAB800CEAB1D /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91B6EA051E83215000B5CF01 /* UserNotifications.framework */; };
@@ -81,6 +80,11 @@
8180
DE97177A2756E6FF00FC409E /* OneSignalOutcomes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D18C327038240002D3A5D /* OneSignalOutcomes.framework */; };
8281
DEA4B4502888B01000E9FE12 /* OneSignalUser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA4B44F2888B01000E9FE12 /* OneSignalUser.framework */; };
8382
DEA4B4512888B01000E9FE12 /* OneSignalUser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA4B44F2888B01000E9FE12 /* OneSignalUser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
83+
DEBAAEBE2A43844700BF2C1C /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAEBD2A43844700BF2C1C /* CoreLocation.framework */; };
84+
DEBAAEC02A43844E00BF2C1C /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAEBF2A43844E00BF2C1C /* OneSignalInAppMessages.framework */; };
85+
DEBAAEC12A43844E00BF2C1C /* OneSignalInAppMessages.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAEBF2A43844E00BF2C1C /* OneSignalInAppMessages.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
86+
DEBAAEC32A43845400BF2C1C /* OneSignalLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAEC22A43845400BF2C1C /* OneSignalLocation.framework */; };
87+
DEBAAEC42A43845400BF2C1C /* OneSignalLocation.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAEC22A43845400BF2C1C /* OneSignalLocation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8488
DEC08AFD2947CE3000C81DA3 /* SwiftTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC08AFC2947CE3000C81DA3 /* SwiftTest.swift */; };
8589
/* End PBXBuildFile section */
8690

@@ -155,7 +159,9 @@
155159
dstPath = "";
156160
dstSubfolderSpec = 10;
157161
files = (
162+
DEBAAEC12A43844E00BF2C1C /* OneSignalInAppMessages.framework in Embed Frameworks */,
158163
DE7D180827026BB5002D3A5D /* OneSignalCore.framework in Embed Frameworks */,
164+
DEBAAEC42A43845400BF2C1C /* OneSignalLocation.framework in Embed Frameworks */,
159165
DE61E484294810B900CD12F1 /* OneSignalFramework.framework in Embed Frameworks */,
160166
DE9717762756E6E100FC409E /* OneSignalExtension.framework in Embed Frameworks */,
161167
DE12F3F8289B2B7F002F63AA /* OneSignalOSCore.framework in Embed Frameworks */,
@@ -240,6 +246,11 @@
240246
DEA2266A261E62780092FF58 /* OneSignal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignal.framework; sourceTree = BUILT_PRODUCTS_DIR; };
241247
DEA2266C261E627D0092FF58 /* OneSignal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignal.framework; sourceTree = BUILT_PRODUCTS_DIR; };
242248
DEA4B44F2888B01000E9FE12 /* OneSignalUser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignalUser.framework; sourceTree = BUILT_PRODUCTS_DIR; };
249+
DEBAAE1F2A4210FE00BF2C1C /* OneSignalLocation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignalLocation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
250+
DEBAAEBA2A4383B200BF2C1C /* OneSignalInAppMessages.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignalInAppMessages.framework; sourceTree = BUILT_PRODUCTS_DIR; };
251+
DEBAAEBD2A43844700BF2C1C /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; };
252+
DEBAAEBF2A43844E00BF2C1C /* OneSignalInAppMessages.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignalInAppMessages.framework; sourceTree = BUILT_PRODUCTS_DIR; };
253+
DEBAAEC22A43845400BF2C1C /* OneSignalLocation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignalLocation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
243254
DEC08AFC2947CE3000C81DA3 /* SwiftTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftTest.swift; sourceTree = "<group>"; };
244255
DEC08AFE2947CED000C81DA3 /* OneSignalExample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OneSignalExample-Bridging-Header.h"; sourceTree = "<group>"; };
245256
/* End PBXFileReference section */
@@ -250,9 +261,11 @@
250261
buildActionMask = 2147483647;
251262
files = (
252263
CACBAAB6218A7136000ACAA5 /* WebKit.framework in Frameworks */,
264+
DEBAAEC32A43845400BF2C1C /* OneSignalLocation.framework in Frameworks */,
265+
DEBAAEBE2A43844700BF2C1C /* CoreLocation.framework in Frameworks */,
253266
DEA4B4502888B01000E9FE12 /* OneSignalUser.framework in Frameworks */,
254267
DE7D18C427038240002D3A5D /* OneSignalOutcomes.framework in Frameworks */,
255-
03432CDC1EBD426A0071FC48 /* CoreLocation.framework in Frameworks */,
268+
DEBAAEC02A43844E00BF2C1C /* OneSignalInAppMessages.framework in Frameworks */,
256269
DE12F3F7289B2B7F002F63AA /* OneSignalOSCore.framework in Frameworks */,
257270
9112E8A71E724EE00022A1CB /* SystemConfiguration.framework in Frameworks */,
258271
DE9717752756E6E000FC409E /* OneSignalExtension.framework in Frameworks */,
@@ -364,6 +377,11 @@
364377
9112E8A21E724DCA0022A1CB /* Frameworks */ = {
365378
isa = PBXGroup;
366379
children = (
380+
DEBAAEC22A43845400BF2C1C /* OneSignalLocation.framework */,
381+
DEBAAEBF2A43844E00BF2C1C /* OneSignalInAppMessages.framework */,
382+
DEBAAEBD2A43844700BF2C1C /* CoreLocation.framework */,
383+
DEBAAEBA2A4383B200BF2C1C /* OneSignalInAppMessages.framework */,
384+
DEBAAE1F2A4210FE00BF2C1C /* OneSignalLocation.framework */,
367385
DE61E49C2948119100CD12F1 /* OneSignalUser.framework */,
368386
DE61E4992948118C00CD12F1 /* OneSignalOutcomes.framework */,
369387
DE61E4962948118900CD12F1 /* OneSignalOSCore.framework */,

0 commit comments

Comments
 (0)