Browse Source

Add CocoaPods PrivacyInfo Integration (#3839)

### Goals :soccer:
This PR adds the final support for PrivacyInfo through CocoaPods.
Jon Shier 1 year ago
parent
commit
4cf2abab47
5 changed files with 31 additions and 24 deletions
  1. 1 1
      .ruby-version
  2. 6 0
      Alamofire.podspec
  3. 22 21
      Gemfile.lock
  4. 1 1
      Package.swift
  5. 1 1
      Package@swift-5.9.swift

+ 1 - 1
.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.0

+ 6 - 0
Alamofire.podspec

@@ -8,6 +8,10 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/Alamofire/Alamofire.git', :tag => s.version }
   s.documentation_url = 'https://alamofire.github.io/Alamofire/'
 
+  # Ensure developers won't hit CocoaPods/CocoaPods#11402 with the resource
+  # bundle for the privacy manifest.
+  s.cocoapods_version = '>= 1.12.0'
+
   s.ios.deployment_target = '10.0'
   s.osx.deployment_target = '10.12'
   s.tvos.deployment_target = '10.0'
@@ -18,4 +22,6 @@ Pod::Spec.new do |s|
   s.source_files = 'Source/**/*.swift'
 
   s.frameworks = 'CFNetwork'
+
+  s.resource_bundles = {'Alamofire' => ['Source/PrivacyInfo.xcprivacy']}
 end

+ 22 - 21
Gemfile.lock

@@ -1,9 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (7.1.1)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -13,21 +15,21 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     claide (1.1.0)
-    cocoapods (1.14.0)
+    cocoapods (1.15.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.14.0)
+      cocoapods-core (= 1.15.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -40,7 +42,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.14.0)
+    cocoapods-core (1.15.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -51,7 +53,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (2.0)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -60,10 +62,9 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    drb (2.1.1)
-      ruby2_keywords
+    drb (2.2.1)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
@@ -84,34 +85,34 @@ GEM
       sassc (~> 2.1)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    json (2.6.3)
+    json (2.7.1)
     liferaft (0.0.6)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.22.2)
     molinillo (0.8.0)
     mustache (1.1.1)
-    mutex_m (0.1.2)
+    mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    nkf (0.2.0)
     open4 (1.3.4)
     public_suffix (4.0.7)
     redcarpet (3.6.0)
     rexml (3.2.6)
     rouge (2.0.7)
     ruby-macho (2.5.1)
-    ruby2_keywords (0.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sqlite3 (1.6.7)
+    sqlite3 (1.7.2)
       mini_portile2 (~> 2.8.0)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -130,4 +131,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   2.4.10
+   2.5.3

+ 1 - 1
Package.swift

@@ -37,7 +37,7 @@ let package = Package(name: "Alamofire",
                       targets: [.target(name: "Alamofire",
                                         path: "Source",
                                         exclude: ["Info.plist"],
-                                        resources: [.copy("PrivacyInfo.xcprivacy")],
+                                        resources: [.process("PrivacyInfo.xcprivacy")],
                                         linkerSettings: [.linkedFramework("CFNetwork",
                                                                           .when(platforms: [.iOS,
                                                                                             .macOS,

+ 1 - 1
Package@swift-5.9.swift

@@ -37,7 +37,7 @@ let package = Package(name: "Alamofire",
                       targets: [.target(name: "Alamofire",
                                         path: "Source",
                                         exclude: ["Info.plist"],
-                                        resources: [.copy("PrivacyInfo.xcprivacy")],
+                                        resources: [.process("PrivacyInfo.xcprivacy")],
                                         linkerSettings: [.linkedFramework("CFNetwork",
                                                                           .when(platforms: [.iOS,
                                                                                             .macOS,