From c91b8a8d56de3d56fc08e1a6cfba47439e12cbfe Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 2 May 2023 13:50:06 +1000 Subject: [PATCH] Use Tracks version 2.2.0 This version includes the changes from https://github.com/Automattic/Automattic-Tracks-iOS/pull/253 which are required by the work on this branch --- Podfile | 4 ++-- Podfile.lock | 35 +++++++++++++++-------------------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/Podfile b/Podfile index 3c6b5ef80247..03bb9998ab90 100644 --- a/Podfile +++ b/Podfile @@ -216,9 +216,9 @@ abstract_target 'Apps' do # Production - # pod 'Automattic-Tracks-iOS', '~> 0.13' + pod 'Automattic-Tracks-iOS', '~> 2.2' # While in PR - pod 'Automattic-Tracks-iOS', git: 'https://github.com/Automattic/Automattic-Tracks-iOS.git', branch: 'task/expat-split-event-name-prefix-and-platform' + # pod 'Automattic-Tracks-iOS', git: 'https://github.com/Automattic/Automattic-Tracks-iOS.git', branch: '' # Local Development # pod 'Automattic-Tracks-iOS', path: '~/Projects/Automattic-Tracks-iOS' diff --git a/Podfile.lock b/Podfile.lock index f253e5616cbf..24d215e41afb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -20,7 +20,7 @@ PODS: - AppCenter/Core - AppCenter/Distribute (4.4.1): - AppCenter/Core - - Automattic-Tracks-iOS (2.0.0): + - Automattic-Tracks-iOS (2.2.0): - Sentry (~> 8.0) - Sodium (>= 0.9.1) - UIDeviceIdentifier (~> 2.0) @@ -490,17 +490,17 @@ PODS: - SDWebImageWebPCoder (0.8.5): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.10) - - Sentry (8.5.0): - - Sentry/Core (= 8.5.0) - - SentryPrivate (= 8.5.0) - - Sentry/Core (8.5.0): - - SentryPrivate (= 8.5.0) - - SentryPrivate (8.5.0) + - Sentry (8.6.0): + - Sentry/Core (= 8.6.0) + - SentryPrivate (= 8.6.0) + - Sentry/Core (8.6.0): + - SentryPrivate (= 8.6.0) + - SentryPrivate (8.6.0) - Sodium (0.9.1) - Starscream (3.0.6) - SVProgressHUD (2.2.5) - SwiftLint (0.50.3) - - UIDeviceIdentifier (2.2.0) + - UIDeviceIdentifier (2.3.0) - WordPress-Aztec-iOS (1.19.8) - WordPress-Editor-iOS (1.19.8): - WordPress-Aztec-iOS (= 1.19.8) @@ -544,7 +544,7 @@ DEPENDENCIES: - AlamofireNetworkActivityIndicator (~> 2.4) - AppCenter (~> 4.1) - AppCenter/Distribute (~> 4.1) - - Automattic-Tracks-iOS (from `https://github.com/Automattic/Automattic-Tracks-iOS.git`, branch `task/expat-split-event-name-prefix-and-platform`) + - Automattic-Tracks-iOS (~> 2.2) - boost (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.94.0/third-party-podspecs/boost.podspec.json`) - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.94.0/third-party-podspecs/BVLinearGradient.podspec.json`) - CocoaLumberjack/Swift (~> 3.0) @@ -630,6 +630,7 @@ SPEC REPOS: - AlamofireNetworkActivityIndicator - AppAuth - AppCenter + - Automattic-Tracks-iOS - CocoaLumberjack - CropViewController - DoubleConversion @@ -674,9 +675,6 @@ SPEC REPOS: - ZIPFoundation EXTERNAL SOURCES: - Automattic-Tracks-iOS: - :branch: task/expat-split-event-name-prefix-and-platform - :git: https://github.com/Automattic/Automattic-Tracks-iOS.git boost: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.94.0/third-party-podspecs/boost.podspec.json BVLinearGradient: @@ -785,9 +783,6 @@ EXTERNAL SOURCES: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.94.0/third-party-podspecs/Yoga.podspec.json CHECKOUT OPTIONS: - Automattic-Tracks-iOS: - :commit: ede4b837940bd0c4311b0bbc92f2e89f60cdd52f - :git: https://github.com/Automattic/Automattic-Tracks-iOS.git FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 @@ -809,7 +804,7 @@ SPEC CHECKSUMS: AlamofireNetworkActivityIndicator: 9acc3de3ca6645bf0efed462396b0df13dd3e7b8 AppAuth: e48b432bb4ba88b10cb2bcc50d7f3af21e78b9c2 AppCenter: b0b6f1190215b5f983c42934db718f3b46fff3c0 - Automattic-Tracks-iOS: 24f956168fdb07d65f8c34380db8c68b84896516 + Automattic-Tracks-iOS: a1b020ab02f0e5a39c5d4e6870a498273f286158 boost: 32a63928ef0a5bf8b60f6b930c8864113fa28779 BVLinearGradient: 708898fab8f7113d927b0ef611a321e759f6ad3e CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732 @@ -880,13 +875,13 @@ SPEC CHECKSUMS: RNTAztecView: 80480c43423929f7e3b7012670787e7375fbac9c SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d - Sentry: 3be3f42e40e5a552935552e115744d5810a216d9 - SentryPrivate: 8c9463280e282527f938d1a5d1d60f8e10ff279b + Sentry: d80553ff85ea72def75b792aaa5a71c158e51595 + SentryPrivate: ef1c5b3dfe44ec0c70e2eb343a5be2689164c021 Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SwiftLint: 77f7cb2b9bb81ab4a12fcc86448ba3f11afa50c6 - UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67 + UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17 WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504 WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345 WordPressAuthenticator: b0b900696de5129a215adcd1e9ae6eb89da36ac8 @@ -905,6 +900,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37 -PODFILE CHECKSUM: 113746b996f590a2656607cd54168bda619a6c03 +PODFILE CHECKSUM: ab88bd849ac377484fd7f0c4b079701ce16de5a3 COCOAPODS: 1.11.3