Privacy Manifest, Skip CI, Bump to 6.8.0

ReactiveX · Oct 3, 2024 · 0e54768 · 0e54768
1 parent 35d121a
commit 0e54768
Show file tree

Hide file tree

Showing 18 changed files with 124 additions and 32 deletions.
diff --git a/Package.swift b/Package.swift
@@ -14,20 +14,30 @@ extension Product {
   }
 }
 
+extension Target {
+    static func rxTarget(name: String, dependencies: [Target.Dependency]) -> Target {
+        .target(
+            name: name,
+            dependencies: dependencies,
+            resources: [.copy("PrivacyInfo.xcprivacy")]
+        )
+    }
+}
+
 extension Target {
   static func rxCocoa() -> [Target] {
     #if os(Linux)
-      return [.target(name: "RxCocoa", dependencies: ["RxSwift", "RxRelay"])]
+      return [.rxTarget(name: "RxCocoa", dependencies: ["RxSwift", "RxRelay"])]
     #else
-      return [.target(name: "RxCocoa", dependencies: ["RxSwift", "RxRelay", "RxCocoaRuntime"])]
+      return [.rxTarget(name: "RxCocoa", dependencies: ["RxSwift", "RxRelay", "RxCocoaRuntime"])]
     #endif
   }
 
   static func rxCocoaRuntime() -> [Target] {
     #if os(Linux)
       return []
     #else
-      return [.target(name: "RxCocoaRuntime", dependencies: ["RxSwift"])]
+      return [.rxTarget(name: "RxCocoaRuntime", dependencies: ["RxSwift"])]
     #endif
   }
 
@@ -60,12 +70,12 @@ let package = Package(
   ] as [[Product]]).flatMap { $0 },
   targets: ([
     [
-      .target(name: "RxSwift", dependencies: []),
-    ], 
+      .rxTarget(name: "RxSwift", dependencies: []),
+    ],
     Target.rxCocoa(),
     Target.rxCocoaRuntime(),
     [
-      .target(name: "RxRelay", dependencies: ["RxSwift"]),
+      .rxTarget(name: "RxRelay", dependencies: ["RxSwift"]),
       .target(name: "RxBlocking", dependencies: ["RxSwift"]),
       .target(name: "RxTest", dependencies: ["RxSwift"]),
     ],

diff --git a/[email protected] b/[email protected]
@@ -14,20 +14,30 @@ extension Product {
   }
 }
 
+extension Target {
+    static func rxTarget(name: String, dependencies: [Target.Dependency]) -> Target {
+        .target(
+            name: name,
+            dependencies: dependencies,
+            resources: [.copy("PrivacyInfo.xcprivacy")]
+        )
+    }
+}
+
 extension Target {
   static func rxCocoa() -> [Target] {
     #if os(Linux)
-      return [.target(name: "RxCocoa", dependencies: ["RxSwift", "RxRelay"])]
+      return [.rxTarget(name: "RxCocoa", dependencies: ["RxSwift", "RxRelay"])]
     #else
-      return [.target(name: "RxCocoa", dependencies: ["RxSwift", "RxRelay", "RxCocoaRuntime"])]
+      return [.rxTarget(name: "RxCocoa", dependencies: ["RxSwift", "RxRelay", "RxCocoaRuntime"])]
     #endif
   }
 
   static func rxCocoaRuntime() -> [Target] {
     #if os(Linux)
       return []
     #else
-      return [.target(name: "RxCocoaRuntime", dependencies: ["RxSwift"])]
+      return [.rxTarget(name: "RxCocoaRuntime", dependencies: ["RxSwift"])]
     #endif
   }
 
@@ -60,12 +70,12 @@ let package = Package(
   ] as [[Product]]).flatMap { $0 },
   targets: ([
     [
-      .target(name: "RxSwift", dependencies: []),
+      .rxTarget(name: "RxSwift", dependencies: []),
     ],
     Target.rxCocoa(),
     Target.rxCocoaRuntime(),
     [
-      .target(name: "RxRelay", dependencies: ["RxSwift"]),
+      .rxTarget(name: "RxRelay", dependencies: ["RxSwift"]),
       .target(name: "RxBlocking", dependencies: ["RxSwift"]),
       .target(name: "RxTest", dependencies: ["RxSwift"]),
     ],

diff --git a/README.md b/README.md
@@ -138,14 +138,14 @@ Open Rx.xcworkspace, choose `RxExample` and hit run. This method will build ever
 use_frameworks!
 
 target 'YOUR_TARGET_NAME' do
-    pod 'RxSwift', '6.7.1'
-    pod 'RxCocoa', '6.7.1'
+    pod 'RxSwift', '6.8.0'
+    pod 'RxCocoa', '6.8.0'
 end
 
 # RxTest and RxBlocking make the most sense in the context of unit/integration tests
 target 'YOUR_TESTING_TARGET' do
-    pod 'RxBlocking', '6.7.1'
-    pod 'RxTest', '6.7.1'
+    pod 'RxBlocking', '6.8.0'
+    pod 'RxTest', '6.8.0'
 end
 ```
 
@@ -175,7 +175,7 @@ Simply drag the needed framework binaries to your **Frameworks, Libraries, and E
 Add this to `Cartfile`
 
 ```
-github "ReactiveX/RxSwift" "6.7.1"
+github "ReactiveX/RxSwift" "6.8.0"
 ```
 
 ```bash

diff --git a/RxBlocking.podspec b/RxBlocking.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxBlocking"
-  s.version          = "6.7.1"
+  s.version          = "6.8.0"
   s.summary          = "RxSwift Blocking operators"
   s.description      = <<-DESC
 Set of blocking operators for RxSwift. These operators are mostly intended for unit/integration tests
@@ -25,7 +25,7 @@ Waiting for observable sequence to complete before exiting command line applicat
   s.source_files          = 'RxBlocking/**/*.swift', 'Platform/**/*.swift'
   s.exclude_files         = 'RxBlocking/Platform/**/*.swift'
 
-  s.dependency 'RxSwift', '6.7.1'
+  s.dependency 'RxSwift', '6.8.0'
   s.swift_version = '5.1'
 
   s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

diff --git a/RxBlocking/Info.plist b/RxBlocking/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.7.1</string>
+	<string>6.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/RxCocoa.podspec b/RxCocoa.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxCocoa"
-  s.version          = "6.7.1"
+  s.version          = "6.8.0"
   s.summary          = "RxSwift Cocoa extensions"
   s.description      = <<-DESC
 * UI extensions
@@ -23,8 +23,12 @@ Pod::Spec.new do |s|
   s.source_files          = 'RxCocoa/**/*.{swift,h,m}', 'Platform/**/*.swift'
   s.exclude_files         = 'RxCocoa/Platform/**/*.swift', 'Platform/AtomicInt.swift'
 
-  s.dependency 'RxSwift', '6.7.1'
-  s.dependency 'RxRelay', '6.7.1'
+  s.dependency 'RxSwift', '6.8.0'
+  s.dependency 'RxRelay', '6.8.0'
+
+  s.resource_bundles = {
+    'RxCocoa_Privacy' => ['Sources/RxCocoa/PrivacyInfo.xcprivacy'],
+  }
 
   s.swift_version = '5.1'
 

diff --git a/RxCocoa/Info.plist b/RxCocoa/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.7.1</string>
+	<string>6.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/RxRelay.podspec b/RxRelay.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxRelay"
-  s.version          = "6.7.1"
+  s.version          = "6.8.0"
   s.summary          = "Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay"
   s.description      = <<-DESC
 Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay
@@ -24,7 +24,11 @@ Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay
 
   s.source_files          = 'RxRelay/**/*.{swift,h,m}'
 
-  s.dependency 'RxSwift', '6.7.1'
+  s.resource_bundles = {
+    'RxRelay_Privacy' => ['Sources/RxRelay/PrivacyInfo.xcprivacy'],
+  }
+
+  s.dependency 'RxSwift', '6.8.0'
   s.swift_version = '5.1'
 
   s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

diff --git a/RxRelay/Info.plist b/RxRelay/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.7.1</string>
+	<string>6.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/RxSwift.podspec b/RxSwift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxSwift"
-  s.version          = "6.7.1"
+  s.version          = "6.8.0"
   s.summary          = "RxSwift is a Swift implementation of Reactive Extensions"
   s.description      = <<-DESC
 This is a Swift port of [ReactiveX.io](https://github.com/ReactiveX)
@@ -35,6 +35,10 @@ gitDiff().grep("bug").less          // sequences of swift objects
   s.source_files          = 'RxSwift/**/*.swift', 'Platform/**/*.swift'
   s.exclude_files         = 'RxSwift/Platform/**/*.swift'
 
+  s.resource_bundles = {
+    'RxSwift_Privacy' => ['Sources/RxSwift/PrivacyInfo.xcprivacy'],
+  }
+
   s.swift_version = '5.1'
 
   s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }

diff --git a/RxSwift/Info.plist b/RxSwift/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.7.1</string>
+	<string>6.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/RxTest.podspec b/RxTest.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxTest"
-  s.version          = "6.7.1"
+  s.version          = "6.8.0"
   s.summary          = "RxSwift Testing extensions"
   s.description      = <<-DESC
 Unit testing extensions for RxSwift. This library contains mock schedulers, observables, and observers
@@ -56,7 +56,11 @@ func testMap() {
 
   s.weak_framework    = 'XCTest'
 
-  s.dependency 'RxSwift', '6.7.1'
+  s.resource_bundles = {
+    'RxTest_Privacy' => ['Sources/RxTest/PrivacyInfo.xcprivacy'],
+  }
+
+  s.dependency 'RxSwift', '6.8.0'
   s.swift_version = '5.1'
 
   s.pod_target_xcconfig = {

diff --git a/RxTest/Info.plist b/RxTest/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.7.1</string>
+	<string>6.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Sources/RxCocoa/PrivacyInfo.xcprivacy b/Sources/RxCocoa/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+</dict>
+</plist>
diff --git a/Sources/RxCocoaRuntime/PrivacyInfo.xcprivacy b/Sources/RxCocoaRuntime/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+</dict>
+</plist>
diff --git a/Sources/RxRelay/PrivacyInfo.xcprivacy b/Sources/RxRelay/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+</dict>
+</plist>
diff --git a/Sources/RxSwift/PrivacyInfo.xcprivacy b/Sources/RxSwift/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+</dict>
+</plist>
diff --git a/scripts/package-spm.swift b/scripts/package-spm.swift
@@ -98,7 +98,7 @@ func packageRelativePath(_ paths: [String], targetDirName: String, excluded: [St
     print("Checking " + targetPath)
 
     for file in try fileManager.contentsOfDirectory(atPath: targetPath).sorted(by: { $0 < $1 })  {
-        if file != "include" && file != ".DS_Store" {
+        if file != "include" && file != ".DS_Store" && file != "PrivacyInfo.xcprivacy" {
             print("Checking extension \(file)")
             try checkExtension(file)