Skip to content

Commit 730d6dc

Browse files
authored
Merge pull request #1079 from OneSignal/modular_distribution
Modular distribution
2 parents aa31a1e + d64aed7 commit 730d6dc

File tree

17 files changed

+421
-46
lines changed

17 files changed

+421
-46
lines changed

OneSignal.podspec

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,22 @@ Pod::Spec.new do |s|
77
s.author = { "Joseph Kalash" => "[email protected]", "Josh Kasten" => "[email protected]" , "Brad Hesse" => "[email protected]"}
88

99
s.source = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
10-
11-
s.platform = :ios
12-
s.requires_arc = true
13-
14-
s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/Framework/OneSignal.framework'
15-
s.framework = 'SystemConfiguration', 'UIKit', 'UserNotifications', 'WebKit', 'CoreGraphics'
10+
s.platform = :ios, "9.0"
11+
s.requires_arc = true
12+
13+
s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
14+
s.subspec 'OneSignalCore' do |ss|
15+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
16+
end
17+
18+
s.subspec 'OneSignalOutcomes' do |ss|
19+
ss.dependency 'OneSignal/OneSignalCore'
20+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
21+
end
22+
23+
s.subspec 'OneSignalExtension' do |ss|
24+
ss.dependency 'OneSignal/OneSignalCore'
25+
ss.dependency 'OneSignal/OneSignalOutcomes'
26+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
27+
end
1628
end

OneSignalDynamic.podspec

Lines changed: 0 additions & 17 deletions
This file was deleted.

OneSignalExtensionWrapper/dummy.m

Whitespace-only changes.

OneSignalExtensionWrapper/include/dummy.h

Whitespace-only changes.

OneSignalOutcomesWrapper/dummy.m

Whitespace-only changes.

OneSignalOutcomesWrapper/include/dummy.h

Whitespace-only changes.

OneSignalWrapper/dummy.m

Whitespace-only changes.

OneSignalWrapper/include/dummy.h

Whitespace-only changes.

OneSignalXCFramework.podspec

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,24 @@ Pod::Spec.new do |s|
77
s.author = { "Joseph Kalash" => "[email protected]", "Josh Kasten" => "[email protected]" , "Brad Hesse" => "[email protected]"}
88

99
s.source = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
10-
s.platform = :ios
11-
s.requires_arc = true
10+
s.platform = :ios, '9.0'
11+
s.requires_arc = true
1212

1313
s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
14-
s.preserve_paths = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
15-
14+
15+
s.subspec 'OneSignalCore' do |ss|
16+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
17+
end
18+
19+
s.subspec 'OneSignalOutcomes' do |ss|
20+
ss.dependency 'OneSignalXCFramework/OneSignalCore'
21+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
22+
end
23+
24+
s.subspec 'OneSignalExtension' do |ss|
25+
ss.dependency 'OneSignalXCFramework/OneSignalCore'
26+
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
27+
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
28+
end
1629
end
1730

Package.swift

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.1
1+
// swift-tools-version:5.3
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -8,15 +8,59 @@ let package = Package(
88
products: [
99
.library(
1010
name: "OneSignal",
11-
targets: ["OneSignal"]),
11+
targets: ["OneSignalWrapper"]),
12+
.library(
13+
name: "OneSignalExtension",
14+
targets: ["OneSignalExtensionWrapper"]),
1215
],
1316
targets: [
1417
.target(
15-
name: "OneSignal",
16-
dependencies: [],
17-
path: "iOS_SDK/OneSignalSDK/",
18-
sources: ["Source"],
19-
publicHeadersPath:"SwiftPM/Public/Headers"),
18+
name: "OneSignalWrapper",
19+
dependencies: [
20+
"OneSignal",
21+
"OneSignalExtension",
22+
"OneSignalOutcomes",
23+
"OneSignalCore"
24+
],
25+
path: "OneSignalWrapper"
26+
),
27+
.target(
28+
name: "OneSignalExtensionWrapper",
29+
dependencies: [
30+
"OneSignalExtension",
31+
"OneSignalOutcomes",
32+
"OneSignalCore"
33+
],
34+
path: "OneSignalExtensionWrapper"
35+
),
36+
.target(
37+
name: "OneSignalOutcomesWrapper",
38+
dependencies: [
39+
"OneSignalOutcomes",
40+
"OneSignalCore"
41+
],
42+
path: "OneSignalOutcomesWrapper"
43+
),
44+
.binaryTarget(
45+
name: "OneSignal",
46+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.9.1/OneSignal.xcframework.zip",
47+
checksum: "7b5f7c306ad2ad4a56d5de3426c220c1ea44417e141b0b132d290bf6a15e7aae"
48+
),
49+
.binaryTarget(
50+
name: "OneSignalExtension",
51+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.9.1/OneSignalExtension.xcframework.zip",
52+
checksum: "372f8fce6f80d3b6a24c2a4ee883c9ecb7dce3d01c92e347e1a16559834e81c1"
53+
),
54+
.binaryTarget(
55+
name: "OneSignalOutcomes",
56+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.9.1/OneSignalOutcomes.xcframework.zip",
57+
checksum: "e59761a2c32a0ccf6fa8f059119e962390bbccc5f0786fc0a0cc032dbcff4bc0"
58+
),
59+
.binaryTarget(
60+
name: "OneSignalCore",
61+
url: "https://github.com/OneSignal/OneSignal-iOS-SDK/releases/download/3.9.1/OneSignalCore.xcframework.zip",
62+
checksum: "bf61c8bbc856d8ac1d28981542f3cc66294ac75ed4267aae7c05af460dece2ac"
63+
)
2064
]
2165
)
2266

0 commit comments

Comments
 (0)