diff --git a/Podfile b/Podfile index 4d908eb2fed7..e6b616838350 100644 --- a/Podfile +++ b/Podfile @@ -216,9 +216,9 @@ abstract_target 'Apps' do # Production - pod 'Automattic-Tracks-iOS', '~> 0.13' + # pod 'Automattic-Tracks-iOS', '~> 0.13' # While in PR - # pod 'Automattic-Tracks-iOS', git: 'https://github.com/Automattic/Automattic-Tracks-iOS.git', branch: '' + pod 'Automattic-Tracks-iOS', git: 'https://github.com/Automattic/Automattic-Tracks-iOS.git', branch: 'task/expat-split-event-name-prefix-and-platform' # Local Development # pod 'Automattic-Tracks-iOS', path: '~/Projects/Automattic-Tracks-iOS' @@ -404,7 +404,9 @@ pre_install do |installer| installer.pod_targets.each do |pod| # Statically linking Sentry results in a conflict with `NSDictionary.objectAtKeyPath`, but dynamically # linking it resolves this. - if pod.name == 'Sentry' + # + # The regex is to match both "Sentry" and "SentryPrivate" pods. + if pod.name =~ /^Sentry/ dynamic << pod next end diff --git a/Podfile.lock b/Podfile.lock index d16602aa4c3c..d1741e8f33c7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -20,8 +20,8 @@ PODS: - AppCenter/Core - AppCenter/Distribute (4.4.1): - AppCenter/Core - - Automattic-Tracks-iOS (0.13.0): - - Sentry (~> 7.25) + - Automattic-Tracks-iOS (2.0.0): + - Sentry (~> 8.0) - Sodium (>= 0.9.1) - UIDeviceIdentifier (~> 2.0) - boost (1.76.0) @@ -490,14 +490,17 @@ PODS: - SDWebImageWebPCoder (0.8.5): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.10) - - Sentry (7.27.0): - - Sentry/Core (= 7.27.0) - - Sentry/Core (7.27.0) + - 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) - Sodium (0.9.1) - Starscream (3.0.6) - SVProgressHUD (2.2.5) - SwiftLint (0.50.3) - - UIDeviceIdentifier (2.1.0) + - UIDeviceIdentifier (2.2.0) - WordPress-Aztec-iOS (1.19.8) - WordPress-Editor-iOS (1.19.8): - WordPress-Aztec-iOS (= 1.19.8) @@ -541,7 +544,7 @@ DEPENDENCIES: - AlamofireNetworkActivityIndicator (~> 2.4) - AppCenter (~> 4.1) - AppCenter/Distribute (~> 4.1) - - Automattic-Tracks-iOS (~> 0.13) + - Automattic-Tracks-iOS (from `https://github.com/Automattic/Automattic-Tracks-iOS.git`, branch `task/expat-split-event-name-prefix-and-platform`) - 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) @@ -627,7 +630,6 @@ SPEC REPOS: - AlamofireNetworkActivityIndicator - AppAuth - AppCenter - - Automattic-Tracks-iOS - CocoaLumberjack - CropViewController - DoubleConversion @@ -651,6 +653,7 @@ SPEC REPOS: - SDWebImage - SDWebImageWebPCoder - Sentry + - SentryPrivate - Sodium - Starscream - SVProgressHUD @@ -671,6 +674,9 @@ 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: @@ -779,6 +785,9 @@ 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 @@ -800,7 +809,7 @@ SPEC CHECKSUMS: AlamofireNetworkActivityIndicator: 9acc3de3ca6645bf0efed462396b0df13dd3e7b8 AppAuth: e48b432bb4ba88b10cb2bcc50d7f3af21e78b9c2 AppCenter: b0b6f1190215b5f983c42934db718f3b46fff3c0 - Automattic-Tracks-iOS: 63e55654f500b3e8fb35087e64575e00d12eb2f5 + Automattic-Tracks-iOS: 24f956168fdb07d65f8c34380db8c68b84896516 boost: 32a63928ef0a5bf8b60f6b930c8864113fa28779 BVLinearGradient: 708898fab8f7113d927b0ef611a321e759f6ad3e CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732 @@ -871,12 +880,13 @@ SPEC CHECKSUMS: RNTAztecView: 80480c43423929f7e3b7012670787e7375fbac9c SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d - Sentry: 026b36fdc09531604db9279e55f047fe652e3f4a + Sentry: 3be3f42e40e5a552935552e115744d5810a216d9 + SentryPrivate: 8c9463280e282527f938d1a5d1d60f8e10ff279b Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SwiftLint: 77f7cb2b9bb81ab4a12fcc86448ba3f11afa50c6 - UIDeviceIdentifier: e6a801d25f4f178de5bdf475ffe29050d0148176 + UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67 WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504 WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345 WordPressAuthenticator: b0b900696de5129a215adcd1e9ae6eb89da36ac8 diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index cc73e223553a..6fb002c11362 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -10348,7 +10348,7 @@ path = Classes; sourceTree = ""; }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { + 29B97314FDCFA39411CA2CEA = { isa = PBXGroup; children = ( 3F20FDF3276BF21000DA3CAD /* Packages */, @@ -18630,14 +18630,14 @@ bg, sk, ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; + mainGroup = 29B97314FDCFA39411CA2CEA; packageReferences = ( 3FF1442E266F3C2400138163 /* XCRemoteSwiftPackageReference "ScreenObject" */, 3FC2C33B26C4CF0A00C6D98F /* XCRemoteSwiftPackageReference "XCUITestHelpers" */, 17A8858B2757B97F0071FCA3 /* XCRemoteSwiftPackageReference "AutomatticAbout-swift" */, 3F2B62DA284F4E0B0008CD59 /* XCRemoteSwiftPackageReference "Charts" */, 3F3B23C02858A1B300CACE60 /* XCRemoteSwiftPackageReference "test-collector-swift" */, - 3F411B6D28987E3F002513AE /* XCRemoteSwiftPackageReference "lottie-ios" */, + 3F411B6D28987E3F002513AE /* XCRemoteSwiftPackageReference "lottie-ios.git" */, 3F338B6F289BD3040014ADC5 /* XCRemoteSwiftPackageReference "Nimble" */, ); productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; @@ -19844,6 +19844,7 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework", + "${BUILT_PRODUCTS_DIR}/SentryPrivate/SentryPrivate.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/ZendeskCommonUISDK/CommonUISDK.framework/CommonUISDK", "${PODS_XCFRAMEWORKS_BUILD_DIR}/ZendeskCoreSDK/ZendeskCoreSDK.framework/ZendeskCoreSDK", "${PODS_XCFRAMEWORKS_BUILD_DIR}/ZendeskMessagingAPISDK/MessagingAPI.framework/MessagingAPI", @@ -19855,6 +19856,7 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SentryPrivate.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CommonUISDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZendeskCoreSDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MessagingAPI.framework", @@ -20494,6 +20496,7 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework", + "${BUILT_PRODUCTS_DIR}/SentryPrivate/SentryPrivate.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/ZendeskCommonUISDK/CommonUISDK.framework/CommonUISDK", "${PODS_XCFRAMEWORKS_BUILD_DIR}/ZendeskCoreSDK/ZendeskCoreSDK.framework/ZendeskCoreSDK", "${PODS_XCFRAMEWORKS_BUILD_DIR}/ZendeskMessagingAPISDK/MessagingAPI.framework/MessagingAPI", @@ -20505,6 +20508,7 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SentryPrivate.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CommonUISDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZendeskCoreSDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MessagingAPI.framework", @@ -30345,7 +30349,7 @@ minimumVersion = 0.3.0; }; }; - 3F411B6D28987E3F002513AE /* XCRemoteSwiftPackageReference "lottie-ios" */ = { + 3F411B6D28987E3F002513AE /* XCRemoteSwiftPackageReference "lottie-ios.git" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/airbnb/lottie-ios.git"; requirement = { @@ -30426,12 +30430,12 @@ }; 3F411B6E28987E3F002513AE /* Lottie */ = { isa = XCSwiftPackageProductDependency; - package = 3F411B6D28987E3F002513AE /* XCRemoteSwiftPackageReference "lottie-ios" */; + package = 3F411B6D28987E3F002513AE /* XCRemoteSwiftPackageReference "lottie-ios.git" */; productName = Lottie; }; 3F44DD57289C379C006334CD /* Lottie */ = { isa = XCSwiftPackageProductDependency; - package = 3F411B6D28987E3F002513AE /* XCRemoteSwiftPackageReference "lottie-ios" */; + package = 3F411B6D28987E3F002513AE /* XCRemoteSwiftPackageReference "lottie-ios.git" */; productName = Lottie; }; 3FC2C33C26C4CF0A00C6D98F /* XCUITestHelpers */ = {