Skip to content

Commit 4cf2aba

Browse files
authored
Add CocoaPods PrivacyInfo Integration (Alamofire#3839)
### Goals ⚽ This PR adds the final support for PrivacyInfo through CocoaPods.
1 parent c265d87 commit 4cf2aba

File tree

5 files changed

+31
-24
lines changed

5 files changed

+31
-24
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.3.0

Alamofire.podspec

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Pod::Spec.new do |s|
88
s.source = { :git => 'https://github.com/Alamofire/Alamofire.git', :tag => s.version }
99
s.documentation_url = 'https://alamofire.github.io/Alamofire/'
1010

11+
# Ensure developers won't hit CocoaPods/CocoaPods#11402 with the resource
12+
# bundle for the privacy manifest.
13+
s.cocoapods_version = '>= 1.12.0'
14+
1115
s.ios.deployment_target = '10.0'
1216
s.osx.deployment_target = '10.12'
1317
s.tvos.deployment_target = '10.0'
@@ -18,4 +22,6 @@ Pod::Spec.new do |s|
1822
s.source_files = 'Source/**/*.swift'
1923

2024
s.frameworks = 'CFNetwork'
25+
26+
s.resource_bundles = {'Alamofire' => ['Source/PrivacyInfo.xcprivacy']}
2127
end

Gemfile.lock

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (7.1.1)
8+
activesupport (7.1.3.2)
79
base64
810
bigdecimal
911
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -13,21 +15,21 @@ GEM
1315
minitest (>= 5.1)
1416
mutex_m
1517
tzinfo (~> 2.0)
16-
addressable (2.8.5)
18+
addressable (2.8.6)
1719
public_suffix (>= 2.0.2, < 6.0)
1820
algoliasearch (1.27.5)
1921
httpclient (~> 2.8, >= 2.8.3)
2022
json (>= 1.5.1)
2123
atomos (0.1.3)
22-
base64 (0.1.1)
23-
bigdecimal (3.1.4)
24+
base64 (0.2.0)
25+
bigdecimal (3.1.6)
2426
claide (1.1.0)
25-
cocoapods (1.14.0)
27+
cocoapods (1.15.2)
2628
addressable (~> 2.8)
2729
claide (>= 1.0.2, < 2.0)
28-
cocoapods-core (= 1.14.0)
30+
cocoapods-core (= 1.15.2)
2931
cocoapods-deintegrate (>= 1.0.3, < 2.0)
30-
cocoapods-downloader (>= 2.0)
32+
cocoapods-downloader (>= 2.1, < 3.0)
3133
cocoapods-plugins (>= 1.0.0, < 2.0)
3234
cocoapods-search (>= 1.0.0, < 2.0)
3335
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -40,7 +42,7 @@ GEM
4042
nap (~> 1.0)
4143
ruby-macho (>= 2.3.0, < 3.0)
4244
xcodeproj (>= 1.23.0, < 2.0)
43-
cocoapods-core (1.14.0)
45+
cocoapods-core (1.15.2)
4446
activesupport (>= 5.0, < 8)
4547
addressable (~> 2.8)
4648
algoliasearch (~> 1.0)
@@ -51,7 +53,7 @@ GEM
5153
public_suffix (~> 4.0)
5254
typhoeus (~> 1.0)
5355
cocoapods-deintegrate (1.0.5)
54-
cocoapods-downloader (2.0)
56+
cocoapods-downloader (2.1)
5557
cocoapods-plugins (1.0.0)
5658
nap
5759
cocoapods-search (1.0.1)
@@ -60,10 +62,9 @@ GEM
6062
netrc (~> 0.11)
6163
cocoapods-try (1.2.0)
6264
colored2 (3.1.2)
63-
concurrent-ruby (1.2.2)
65+
concurrent-ruby (1.2.3)
6466
connection_pool (2.4.1)
65-
drb (2.1.1)
66-
ruby2_keywords
67+
drb (2.2.1)
6768
escape (0.0.4)
6869
ethon (0.16.0)
6970
ffi (>= 1.15.0)
@@ -84,34 +85,34 @@ GEM
8485
sassc (~> 2.1)
8586
sqlite3 (~> 1.3)
8687
xcinvoke (~> 0.3.0)
87-
json (2.6.3)
88+
json (2.7.1)
8889
liferaft (0.0.6)
8990
mini_portile2 (2.8.5)
90-
minitest (5.20.0)
91+
minitest (5.22.2)
9192
molinillo (0.8.0)
9293
mustache (1.1.1)
93-
mutex_m (0.1.2)
94+
mutex_m (0.2.0)
9495
nanaimo (0.3.0)
9596
nap (1.1.0)
9697
netrc (0.11.0)
98+
nkf (0.2.0)
9799
open4 (1.3.4)
98100
public_suffix (4.0.7)
99101
redcarpet (3.6.0)
100102
rexml (3.2.6)
101103
rouge (2.0.7)
102104
ruby-macho (2.5.1)
103-
ruby2_keywords (0.0.5)
104105
sassc (2.4.0)
105106
ffi (~> 1.9)
106-
sqlite3 (1.6.7)
107+
sqlite3 (1.7.2)
107108
mini_portile2 (~> 2.8.0)
108-
typhoeus (1.4.0)
109+
typhoeus (1.4.1)
109110
ethon (>= 0.9.0)
110111
tzinfo (2.0.6)
111112
concurrent-ruby (~> 1.0)
112113
xcinvoke (0.3.0)
113114
liferaft (~> 0.0.6)
114-
xcodeproj (1.23.0)
115+
xcodeproj (1.24.0)
115116
CFPropertyList (>= 2.3.3, < 4.0)
116117
atomos (~> 0.1.3)
117118
claide (>= 1.0.2, < 2.0)
@@ -130,4 +131,4 @@ DEPENDENCIES
130131
xcpretty
131132

132133
BUNDLED WITH
133-
2.4.10
134+
2.5.3

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ let package = Package(name: "Alamofire",
3737
targets: [.target(name: "Alamofire",
3838
path: "Source",
3939
exclude: ["Info.plist"],
40-
resources: [.copy("PrivacyInfo.xcprivacy")],
40+
resources: [.process("PrivacyInfo.xcprivacy")],
4141
linkerSettings: [.linkedFramework("CFNetwork",
4242
.when(platforms: [.iOS,
4343
.macOS,

[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ let package = Package(name: "Alamofire",
3737
targets: [.target(name: "Alamofire",
3838
path: "Source",
3939
exclude: ["Info.plist"],
40-
resources: [.copy("PrivacyInfo.xcprivacy")],
40+
resources: [.process("PrivacyInfo.xcprivacy")],
4141
linkerSettings: [.linkedFramework("CFNetwork",
4242
.when(platforms: [.iOS,
4343
.macOS,

0 commit comments

Comments
 (0)