Skip to content

Commit 3e851d9

Browse files
authored
Merge pull request #1186 from OneSignal/user_model/distribution_fixes
[User model] User model distribution changes
2 parents 9cd298a + 6291c29 commit 3e851d9

File tree

73 files changed

+570
-565
lines changed

Some content is hidden

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

73 files changed

+570
-565
lines changed

OneSignal.podspec

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,21 @@ Pod::Spec.new do |s|
1010
s.platform = :ios, "9.0"
1111
s.requires_arc = true
1212

13-
s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
13+
s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
1414
s.subspec 'OneSignalCore' do |ss|
1515
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
1616
end
1717

18+
s.subspec 'OneSignalOSCore' do |ss|
19+
ss.dependency 'OneSignalXCFramework/OneSignalCore'
20+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_OSCore/OneSignalOSCore.xcframework'
21+
end
22+
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+
1828
s.subspec 'OneSignalOutcomes' do |ss|
1929
ss.dependency 'OneSignal/OneSignalCore'
2030
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
@@ -25,4 +35,19 @@ Pod::Spec.new do |s|
2535
ss.dependency 'OneSignal/OneSignalOutcomes'
2636
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
2737
end
38+
39+
s.subspec 'OneSignalNotifications' do |ss|
40+
ss.dependency 'OneSignal/OneSignalCore'
41+
ss.dependency 'OneSignal/OneSignalOutcomes'
42+
ss.dependency 'OneSignal/OneSignalExtension'
43+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework'
44+
end
45+
46+
s.subspec 'OneSignalUser' do |ss|
47+
ss.dependency 'OneSignal/OneSignalCore'
48+
ss.dependency 'OneSignal/OneSignalOSCore'
49+
ss.dependency 'OneSignal/OneSignalOutcomes'
50+
ss.dependency 'OneSignal/OneSignalNotifications'
51+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_User/OneSignalUser.xcframework'
52+
end
2853
end
File renamed without changes.
File renamed without changes.

OneSignalNotificationsWrapper/dummy.m

Whitespace-only changes.

OneSignalNotificationsWrapper/include/dummy.h

Whitespace-only changes.

OneSignalOSCoreWrapper/dummy.m

Whitespace-only changes.

OneSignalOSCoreWrapper/include/dummy.h

Whitespace-only changes.

OneSignalUserWrapper/dummy.m

Whitespace-only changes.

OneSignalUserWrapper/include/dummy.h

Whitespace-only changes.

OneSignalXCFramework.podspec

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,17 @@ Pod::Spec.new do |s|
1010
s.platform = :ios, '9.0'
1111
s.requires_arc = true
1212

13-
s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
13+
s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
1414

1515
s.subspec 'OneSignalCore' do |ss|
1616
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
1717
end
1818

19+
s.subspec 'OneSignalOSCore' do |ss|
20+
ss.dependency 'OneSignalXCFramework/OneSignalCore'
21+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_OSCore/OneSignalOSCore.xcframework'
22+
end
23+
1924
s.subspec 'OneSignalOutcomes' do |ss|
2025
ss.dependency 'OneSignalXCFramework/OneSignalCore'
2126
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
@@ -26,5 +31,20 @@ Pod::Spec.new do |s|
2631
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
2732
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
2833
end
34+
35+
s.subspec 'OneSignalNotifications' do |ss|
36+
ss.dependency 'OneSignalXCFramework/OneSignalCore'
37+
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
38+
ss.dependency 'OneSignalXCFramework/OneSignalExtension'
39+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework'
40+
end
41+
42+
s.subspec 'OneSignalUser' do |ss|
43+
ss.dependency 'OneSignalXCFramework/OneSignalCore'
44+
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
45+
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
46+
ss.dependency 'OneSignalXCFramework/OneSignalNotifications'
47+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_User/OneSignalUser.xcframework'
48+
end
2949
end
3050

0 commit comments

Comments
 (0)