From ab86eab2fa439069595e68bbdd347f19bed537c7 Mon Sep 17 00:00:00 2001 From: Miquel Alvarado Date: Tue, 9 Apr 2024 12:13:41 +0200 Subject: [PATCH 1/4] Include resources --- Analytics.podspec | 1 + Examples/CocoapodsExample/Podfile.lock | 6 +++--- Segment/PrivacyInfo.xcprivacy | 5 ----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Analytics.podspec b/Analytics.podspec index 75743703b..5f5da4c3c 100644 --- a/Analytics.podspec +++ b/Analytics.podspec @@ -23,4 +23,5 @@ Pod::Spec.new do |s| 'Segment/Classes/**/*.{h,m}', 'Segment/Internal/**/*.{h,m}' ] + s.resources = ['Segment/PrivacyInfo.xcprivacy'] end diff --git a/Examples/CocoapodsExample/Podfile.lock b/Examples/CocoapodsExample/Podfile.lock index c1af6315b..c99483e4b 100644 --- a/Examples/CocoapodsExample/Podfile.lock +++ b/Examples/CocoapodsExample/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - Analytics (4.0.5) + - Analytics (4.1.8) DEPENDENCIES: - Analytics (from `../../`) @@ -9,8 +9,8 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - Analytics: ecaad22be45600b95b16849092e0548cf5a40968 + Analytics: d8ad186a6601fc75caa5e7243b5194c3c9a28f1f PODFILE CHECKSUM: 20b258e875ed60a69591787e49bdc3ca9f7c4ad3 -COCOAPODS: 1.9.1 +COCOAPODS: 1.14.2 diff --git a/Segment/PrivacyInfo.xcprivacy b/Segment/PrivacyInfo.xcprivacy index 0c11dc353..bc6b65ca6 100644 --- a/Segment/PrivacyInfo.xcprivacy +++ b/Segment/PrivacyInfo.xcprivacy @@ -65,10 +65,5 @@ - NSPrivacyTrackingDomains - - cdn-settings.segment.com/v1/projects/<writekey>/settings - https://api.segment.io/v1/b - From 1d242b2707f8192fd2ab79679da5c4ae88ba00f3 Mon Sep 17 00:00:00 2001 From: Miquel Alvarado Date: Wed, 10 Apr 2024 08:59:37 +0200 Subject: [PATCH 2/4] Prepare podspec --- Analytics.podspec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Analytics.podspec b/Analytics.podspec index 5f5da4c3c..0b26fa1c6 100644 --- a/Analytics.podspec +++ b/Analytics.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - s.name = "Analytics" + s.name = "Segment-Adevinta" s.module_name = "Segment" s.version = "4.1.8" s.summary = "The hassle-free way to add analytics to your iOS app." @@ -11,9 +11,8 @@ Pod::Spec.new do |s| s.homepage = "http://segment.com/" s.license = { :type => 'MIT' } - s.author = { "Segment" => "friends@segment.com" } - s.source = { :git => "https://github.com/segmentio/analytics-ios.git", :tag => s.version.to_s } - s.social_media_url = 'https://twitter.com/segment' + s.author = { "Adevinta" => "miquel.alvarado@adevinta.com" } + s.source = { :git => "https://github.com/AdevintaSpain/analytics-ios-adevinta", :tag => s.version.to_s } s.ios.deployment_target = '10.0' s.tvos.deployment_target = '10.0' From 4c94b7850c3038e69d1de430c72f19d2cbde70e4 Mon Sep 17 00:00:00 2001 From: Miquel Alvarado Date: Wed, 10 Apr 2024 09:01:48 +0200 Subject: [PATCH 3/4] Rename file --- Analytics.podspec => Segment-Adevinta.podspec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Analytics.podspec => Segment-Adevinta.podspec (100%) diff --git a/Analytics.podspec b/Segment-Adevinta.podspec similarity index 100% rename from Analytics.podspec rename to Segment-Adevinta.podspec From 9114a73d5b4ee54102d05d385758fa523a970b85 Mon Sep 17 00:00:00 2001 From: Miquel Alvarado Date: Wed, 10 Apr 2024 12:20:57 +0200 Subject: [PATCH 4/4] Undo fork changes and add Resources to the Package.swift file as well --- Segment-Adevinta.podspec => Analytics.podspec | 7 ++++--- Package.swift | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) rename Segment-Adevinta.podspec => Analytics.podspec (73%) diff --git a/Segment-Adevinta.podspec b/Analytics.podspec similarity index 73% rename from Segment-Adevinta.podspec rename to Analytics.podspec index 0b26fa1c6..5f5da4c3c 100644 --- a/Segment-Adevinta.podspec +++ b/Analytics.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - s.name = "Segment-Adevinta" + s.name = "Analytics" s.module_name = "Segment" s.version = "4.1.8" s.summary = "The hassle-free way to add analytics to your iOS app." @@ -11,8 +11,9 @@ Pod::Spec.new do |s| s.homepage = "http://segment.com/" s.license = { :type => 'MIT' } - s.author = { "Adevinta" => "miquel.alvarado@adevinta.com" } - s.source = { :git => "https://github.com/AdevintaSpain/analytics-ios-adevinta", :tag => s.version.to_s } + s.author = { "Segment" => "friends@segment.com" } + s.source = { :git => "https://github.com/segmentio/analytics-ios.git", :tag => s.version.to_s } + s.social_media_url = 'https://twitter.com/segment' s.ios.deployment_target = '10.0' s.tvos.deployment_target = '10.0' diff --git a/Package.swift b/Package.swift index 49c7c25c2..f70e1fcf3 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.6 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -26,6 +26,7 @@ let package = Package( dependencies: [], path: "Segment/", sources: ["Classes", "Internal"], + resources: [.process("Resources")], publicHeadersPath: "Classes", cSettings: [ .headerSearchPath("Internal"),