From 80170804af52d7fe63b6496cedbcd6038e36ce87 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Sat, 6 Apr 2024 11:35:46 +0200 Subject: [PATCH 1/7] participate in tea protocol (#3) Co-authored-by: Max Howell --- tea.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tea.yaml diff --git a/tea.yaml b/tea.yaml new file mode 100644 index 000000000..404b0956e --- /dev/null +++ b/tea.yaml @@ -0,0 +1,7 @@ +# https://tea.xyz/what-is-this-file +# created with https://mash.pkgx.sh/mxcl/tea-register +--- +version: 1.0.0 +codeOwners: + - '0x5E2DE4A68df811AAAD32d71fb065e6946fA5C8d9' # mxcl +quorum: 1 From 242b17596e70b665ded6f240594a1e8612111033 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Sat, 6 Apr 2024 13:03:43 +0200 Subject: [PATCH 2/7] Manifest --- PrivacyInfo.xcprivacy | 8 ++++++++ PromiseKit.xcodeproj/project.pbxproj | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 PrivacyInfo.xcprivacy diff --git a/PrivacyInfo.xcprivacy b/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..cfbe279c7 --- /dev/null +++ b/PrivacyInfo.xcprivacy @@ -0,0 +1,8 @@ + + + + + NSPrivacyTracking + + + diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj index 6361b1800..5c77c5ef4 100644 --- a/PromiseKit.xcodeproj/project.pbxproj +++ b/PromiseKit.xcodeproj/project.pbxproj @@ -228,6 +228,7 @@ 63CF6D7F203CD19200EC8927 /* ThenableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThenableTests.swift; sourceTree = ""; }; 63D9B2EE203385FD0075C00B /* race.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = race.m; path = Sources/race.m; sourceTree = ""; }; 63D9B2F020338D5D0075C00B /* Deprecations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Deprecations.swift; path = Sources/Deprecations.swift; sourceTree = ""; }; + 9E21AEED2BC1599400494E96 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 9E4170F8287D88C800A3B4B5 /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Async.swift; sourceTree = ""; }; 9E4170FA287D8DBD00A3B4B5 /* AsyncTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncTests.swift; sourceTree = ""; }; 9E66231526FE5A8C00FA25CB /* RaceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RaceTests.m; sourceTree = ""; }; @@ -421,6 +422,7 @@ 635893971D5BE4F900F14B55 /* README.md */, 635893921D5BE4E000F14B55 /* PromiseKit.playground */, 63B0AC761D595E6300FA21D9 /* PromiseKit.h */, + 9E21AEEC2BC1596F00494E96 /* Resources */, 63B0AC601D595E4C00FA21D9 /* Sources.swift */, 63B912AB1F1E657400D49110 /* Sources.objc */, 635D64061D59630200BC0AF5 /* Tests */, @@ -497,6 +499,14 @@ name = Features; sourceTree = ""; }; + 9E21AEEC2BC1596F00494E96 /* Resources */ = { + isa = PBXGroup; + children = ( + 9E21AEED2BC1599400494E96 /* PrivacyInfo.xcprivacy */, + ); + name = Resources; + sourceTree = ""; + }; C0244E6B2047ACAF00ACB4AC /* JS/A+ */ = { isa = PBXGroup; children = ( From a149fd0d2c0d4941f64c437e5e54d663a3617e32 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Sat, 27 Apr 2024 10:00:32 +0200 Subject: [PATCH 3/7] Resources --- PromiseKit.xcodeproj/project.pbxproj | 8 ++++---- PrivacyInfo.xcprivacy => Resources/PrivacyInfo.xcprivacy | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename PrivacyInfo.xcprivacy => Resources/PrivacyInfo.xcprivacy (100%) diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj index 5c77c5ef4..6313c2c71 100644 --- a/PromiseKit.xcodeproj/project.pbxproj +++ b/PromiseKit.xcodeproj/project.pbxproj @@ -228,10 +228,10 @@ 63CF6D7F203CD19200EC8927 /* ThenableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThenableTests.swift; sourceTree = ""; }; 63D9B2EE203385FD0075C00B /* race.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = race.m; path = Sources/race.m; sourceTree = ""; }; 63D9B2F020338D5D0075C00B /* Deprecations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Deprecations.swift; path = Sources/Deprecations.swift; sourceTree = ""; }; - 9E21AEED2BC1599400494E96 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 9E4170F8287D88C800A3B4B5 /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Async.swift; sourceTree = ""; }; 9E4170FA287D8DBD00A3B4B5 /* AsyncTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncTests.swift; sourceTree = ""; }; 9E66231526FE5A8C00FA25CB /* RaceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RaceTests.m; sourceTree = ""; }; + 9E90AC902BC26D64007CA952 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = Resources/PrivacyInfo.xcprivacy; sourceTree = ""; }; 9EC774262991495C00803027 /* Combine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Combine.swift; path = Sources/Combine.swift; sourceTree = ""; }; 9EC774282991497900803027 /* CombineTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombineTests.swift; sourceTree = ""; }; C013F7372048E3B6006B57B1 /* MockNodeEnvironment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MockNodeEnvironment.swift; path = "Tests/JS-A+/MockNodeEnvironment.swift"; sourceTree = ""; }; @@ -422,7 +422,7 @@ 635893971D5BE4F900F14B55 /* README.md */, 635893921D5BE4E000F14B55 /* PromiseKit.playground */, 63B0AC761D595E6300FA21D9 /* PromiseKit.h */, - 9E21AEEC2BC1596F00494E96 /* Resources */, + 9E90AC922BC26D76007CA952 /* Resources */, 63B0AC601D595E4C00FA21D9 /* Sources.swift */, 63B912AB1F1E657400D49110 /* Sources.objc */, 635D64061D59630200BC0AF5 /* Tests */, @@ -499,10 +499,10 @@ name = Features; sourceTree = ""; }; - 9E21AEEC2BC1596F00494E96 /* Resources */ = { + 9E90AC922BC26D76007CA952 /* Resources */ = { isa = PBXGroup; children = ( - 9E21AEED2BC1599400494E96 /* PrivacyInfo.xcprivacy */, + 9E90AC902BC26D64007CA952 /* PrivacyInfo.xcprivacy */, ); name = Resources; sourceTree = ""; diff --git a/PrivacyInfo.xcprivacy b/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from PrivacyInfo.xcprivacy rename to Resources/PrivacyInfo.xcprivacy From 7162397fb3d5f5924cea33714d6fc361c3b6a335 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Sat, 27 Apr 2024 10:22:46 +0200 Subject: [PATCH 4/7] SPM and CocoaPods --- Package.swift | 3 +++ Package@swift-4.2.swift | 3 +++ Package@swift-5.0.swift | 3 +++ Package@swift-5.3.swift | 3 +++ PromiseKit.podspec | 4 ++++ 5 files changed, 16 insertions(+) diff --git a/Package.swift b/Package.swift index d96717491..445de845c 100644 --- a/Package.swift +++ b/Package.swift @@ -9,6 +9,9 @@ pkg.products = [ let pmk: Target = .target(name: "PromiseKit") pmk.path = "Sources" +pmk.resources = [ + .process("Resources/PrivacyInfo.xcprivacy") +] pmk.exclude = [ "AnyPromise.swift", "AnyPromise.m", diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift index 571ea6b28..52e2b2dce 100644 --- a/Package@swift-4.2.swift +++ b/Package@swift-4.2.swift @@ -9,6 +9,9 @@ pkg.products = [ let pmk: Target = .target(name: "PromiseKit") pmk.path = "Sources" +pmk.resources = [ + .process("Resources/PrivacyInfo.xcprivacy") +] pmk.exclude = [ "AnyPromise.swift", "AnyPromise.m", diff --git a/Package@swift-5.0.swift b/Package@swift-5.0.swift index 5d1ea438f..cd85b005b 100644 --- a/Package@swift-5.0.swift +++ b/Package@swift-5.0.swift @@ -12,6 +12,9 @@ pkg.products = [ let pmk: Target = .target(name: "PromiseKit") pmk.path = "Sources" +pmk.resources = [ + .process("Resources/PrivacyInfo.xcprivacy") +] pmk.exclude = [ "AnyPromise.swift", "AnyPromise.m", diff --git a/Package@swift-5.3.swift b/Package@swift-5.3.swift index 0c4bf4d24..5d5bac30d 100644 --- a/Package@swift-5.3.swift +++ b/Package@swift-5.3.swift @@ -12,6 +12,9 @@ pkg.products = [ let pmk: Target = .target(name: "PromiseKit") pmk.path = "Sources" +pmk.resources = [ + .process("Resources/PrivacyInfo.xcprivacy") +] pmk.exclude = [ "AnyPromise.swift", "AnyPromise.m", diff --git a/PromiseKit.podspec b/PromiseKit.podspec index a4a0f26fa..8e57ea3f8 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -33,6 +33,10 @@ Pod::Spec.new do |s| 'OTHER_SWIFT_FLAGS' => '-DPMKCocoaPods', } + s.resource_bundles = { + 'SwifterSwift_Privacy' => 'Resources/PrivacyInfo.xcprivacy' + } + s.subspec 'Accounts' do |ss| ss.ios.source_files = ss.osx.source_files = 'Extensions/Accounts/Sources/**/*' ss.exclude_files = 'Extensions/Accounts/Sources/*.plist' From 1b376077d1004b3cfab6d4b9221adcd3d1d31dcf Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Sat, 27 Apr 2024 10:26:25 +0200 Subject: [PATCH 5/7] Paths --- PromiseKit.podspec | 2 +- PromiseKit.xcodeproj/project.pbxproj | 9 +++++---- {Resources => Sources/Resources}/PrivacyInfo.xcprivacy | 0 3 files changed, 6 insertions(+), 5 deletions(-) rename {Resources => Sources/Resources}/PrivacyInfo.xcprivacy (100%) diff --git a/PromiseKit.podspec b/PromiseKit.podspec index 8e57ea3f8..9c8c8a762 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -34,7 +34,7 @@ Pod::Spec.new do |s| } s.resource_bundles = { - 'SwifterSwift_Privacy' => 'Resources/PrivacyInfo.xcprivacy' + 'SwifterSwift_Privacy' => 'Sources/Resources/PrivacyInfo.xcprivacy' } s.subspec 'Accounts' do |ss| diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj index 6313c2c71..663b8a41b 100644 --- a/PromiseKit.xcodeproj/project.pbxproj +++ b/PromiseKit.xcodeproj/project.pbxproj @@ -231,7 +231,7 @@ 9E4170F8287D88C800A3B4B5 /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Async.swift; sourceTree = ""; }; 9E4170FA287D8DBD00A3B4B5 /* AsyncTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncTests.swift; sourceTree = ""; }; 9E66231526FE5A8C00FA25CB /* RaceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RaceTests.m; sourceTree = ""; }; - 9E90AC902BC26D64007CA952 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = Resources/PrivacyInfo.xcprivacy; sourceTree = ""; }; + 9E8028F72BDCEDBC0081E2D1 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 9EC774262991495C00803027 /* Combine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Combine.swift; path = Sources/Combine.swift; sourceTree = ""; }; 9EC774282991497900803027 /* CombineTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombineTests.swift; sourceTree = ""; }; C013F7372048E3B6006B57B1 /* MockNodeEnvironment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MockNodeEnvironment.swift; path = "Tests/JS-A+/MockNodeEnvironment.swift"; sourceTree = ""; }; @@ -422,7 +422,6 @@ 635893971D5BE4F900F14B55 /* README.md */, 635893921D5BE4E000F14B55 /* PromiseKit.playground */, 63B0AC761D595E6300FA21D9 /* PromiseKit.h */, - 9E90AC922BC26D76007CA952 /* Resources */, 63B0AC601D595E4C00FA21D9 /* Sources.swift */, 63B912AB1F1E657400D49110 /* Sources.objc */, 635D64061D59630200BC0AF5 /* Tests */, @@ -460,6 +459,7 @@ 63B18AEB1F2D205C00B79E37 /* CustomStringConvertible.swift */, 63D9B2F020338D5D0075C00B /* Deprecations.swift */, 085B96BE21A9B37C00E5E22F /* LogEvent.swift */, + 9E8028F82BDCEDBC0081E2D1 /* Resources */, ); name = Sources.swift; sourceTree = ""; @@ -499,12 +499,13 @@ name = Features; sourceTree = ""; }; - 9E90AC922BC26D76007CA952 /* Resources */ = { + 9E8028F82BDCEDBC0081E2D1 /* Resources */ = { isa = PBXGroup; children = ( - 9E90AC902BC26D64007CA952 /* PrivacyInfo.xcprivacy */, + 9E8028F72BDCEDBC0081E2D1 /* PrivacyInfo.xcprivacy */, ); name = Resources; + path = Sources/Resources; sourceTree = ""; }; C0244E6B2047ACAF00ACB4AC /* JS/A+ */ = { diff --git a/Resources/PrivacyInfo.xcprivacy b/Sources/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from Resources/PrivacyInfo.xcprivacy rename to Sources/Resources/PrivacyInfo.xcprivacy From 951d4f81db3fc0453c4f97aa7bf0cbb7581b7960 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Wed, 1 May 2024 21:09:25 +0200 Subject: [PATCH 6/7] Revert SPM --- Package.swift | 3 --- Package@swift-4.2.swift | 3 --- Package@swift-5.0.swift | 3 --- Package@swift-5.3.swift | 3 --- 4 files changed, 12 deletions(-) diff --git a/Package.swift b/Package.swift index 445de845c..d96717491 100644 --- a/Package.swift +++ b/Package.swift @@ -9,9 +9,6 @@ pkg.products = [ let pmk: Target = .target(name: "PromiseKit") pmk.path = "Sources" -pmk.resources = [ - .process("Resources/PrivacyInfo.xcprivacy") -] pmk.exclude = [ "AnyPromise.swift", "AnyPromise.m", diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift index 52e2b2dce..571ea6b28 100644 --- a/Package@swift-4.2.swift +++ b/Package@swift-4.2.swift @@ -9,9 +9,6 @@ pkg.products = [ let pmk: Target = .target(name: "PromiseKit") pmk.path = "Sources" -pmk.resources = [ - .process("Resources/PrivacyInfo.xcprivacy") -] pmk.exclude = [ "AnyPromise.swift", "AnyPromise.m", diff --git a/Package@swift-5.0.swift b/Package@swift-5.0.swift index cd85b005b..5d1ea438f 100644 --- a/Package@swift-5.0.swift +++ b/Package@swift-5.0.swift @@ -12,9 +12,6 @@ pkg.products = [ let pmk: Target = .target(name: "PromiseKit") pmk.path = "Sources" -pmk.resources = [ - .process("Resources/PrivacyInfo.xcprivacy") -] pmk.exclude = [ "AnyPromise.swift", "AnyPromise.m", diff --git a/Package@swift-5.3.swift b/Package@swift-5.3.swift index 5d5bac30d..0c4bf4d24 100644 --- a/Package@swift-5.3.swift +++ b/Package@swift-5.3.swift @@ -12,9 +12,6 @@ pkg.products = [ let pmk: Target = .target(name: "PromiseKit") pmk.path = "Sources" -pmk.resources = [ - .process("Resources/PrivacyInfo.xcprivacy") -] pmk.exclude = [ "AnyPromise.swift", "AnyPromise.m", From 6a14faeef42bcbac60d86613ed2c1c67be790722 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 10 May 2024 11:46:33 +0200 Subject: [PATCH 7/7] Resources again for Swift 5.3 --- Package@swift-5.3.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Package@swift-5.3.swift b/Package@swift-5.3.swift index 0c4bf4d24..5d5bac30d 100644 --- a/Package@swift-5.3.swift +++ b/Package@swift-5.3.swift @@ -12,6 +12,9 @@ pkg.products = [ let pmk: Target = .target(name: "PromiseKit") pmk.path = "Sources" +pmk.resources = [ + .process("Resources/PrivacyInfo.xcprivacy") +] pmk.exclude = [ "AnyPromise.swift", "AnyPromise.m",