From eb15e273b62aab8b04630c1fe9ca1c3341bc622b Mon Sep 17 00:00:00 2001 From: Isabella Date: Thu, 14 Nov 2024 16:34:12 -0600 Subject: [PATCH] Add FXIOS-10570 Upgrade Sentry to 8.36.0 and switch to Sentry-Dynamic framework for Firefox for iOS and Focus (#23142) * Upgrade Firefox for iOS Sentry to 8.36.0 and switch to Sentry-Dynamic framework. * Upgrade Focus Sentry to 8.36.0 and switch to Sentry-Dynamic framework. --- BrowserKit/Package.swift | 4 +-- firefox-ios/Client.xcodeproj/project.pbxproj | 26 +++++++------------ .../xcshareddata/swiftpm/Package.resolved | 4 +-- .../Blockzilla.xcodeproj/project.pbxproj | 18 ++++++------- .../xcshareddata/swiftpm/Package.resolved | 8 +++--- 5 files changed, 26 insertions(+), 34 deletions(-) diff --git a/BrowserKit/Package.swift b/BrowserKit/Package.swift index 07ee360b3d29..29539c010049 100644 --- a/BrowserKit/Package.swift +++ b/BrowserKit/Package.swift @@ -58,7 +58,7 @@ let package = Package( exact: "2.0.0"), .package( url: "https://github.com/getsentry/sentry-cocoa.git", - exact: "8.21.0"), + exact: "8.36.0"), .package( url: "https://github.com/nbhasin2/GCDWebServer.git", branch: "master"), @@ -92,7 +92,7 @@ let package = Package( name: "Common", dependencies: ["Dip", "SwiftyBeaver", - .product(name: "Sentry", package: "sentry-cocoa")], + .product(name: "Sentry-Dynamic", package: "sentry-cocoa")], swiftSettings: [.unsafeFlags(["-enable-testing"])]), .testTarget( name: "CommonTests", diff --git a/firefox-ios/Client.xcodeproj/project.pbxproj b/firefox-ios/Client.xcodeproj/project.pbxproj index ae4428f10305..d7191bee0e63 100644 --- a/firefox-ios/Client.xcodeproj/project.pbxproj +++ b/firefox-ios/Client.xcodeproj/project.pbxproj @@ -506,7 +506,6 @@ 5A31275828906422001F30FA /* BookmarksDelegateMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A31275728906422001F30FA /* BookmarksDelegateMock.swift */; }; 5A32C2B62AD8517200A9B5A4 /* MetricKitWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A32C2B52AD8517200A9B5A4 /* MetricKitWrapper.swift */; }; 5A37861429A2BFB9006B3A34 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 5A37861329A2BFB9006B3A34 /* Common */; }; - 5A37861929A2C337006B3A34 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 5A37861829A2C337006B3A34 /* Sentry */; }; 5A37861D29A2C37C006B3A34 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 5A37861C29A2C37C006B3A34 /* Common */; }; 5A393F8D2C8A410900D2628D /* SiteImageView in Frameworks */ = {isa = PBXBuildFile; productRef = 5A393F8C2C8A410900D2628D /* SiteImageView */; }; 5A3A2A0D287F742C00B79EAC /* BackgroundSyncUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A3A2A0C287F742C00B79EAC /* BackgroundSyncUtility.swift */; }; @@ -1856,6 +1855,7 @@ ED45893E2CC800D9006F2C0B /* SearchEngineSelectionViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED45893D2CC800D9006F2C0B /* SearchEngineSelectionViewControllerTests.swift */; }; ED4589402CC8220A006F2C0B /* MockSearchEngineSelectionCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED45893F2CC8220A006F2C0B /* MockSearchEngineSelectionCoordinator.swift */; }; ED55DC8C2CC2D7DA00E3FE3A /* SearchEngineSelectionCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED55DC8B2CC2D7DA00E3FE3A /* SearchEngineSelectionCoordinatorTests.swift */; }; + ED6C8DAC2CE6A4BB00D7F7F3 /* Sentry-Dynamic in Frameworks */ = {isa = PBXBuildFile; productRef = ED6C8DAB2CE6A4BB00D7F7F3 /* Sentry-Dynamic */; }; ED70CD812CE3BD2C0018761B /* MockStoreForMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70CD802CE3BD2C0018761B /* MockStoreForMiddleware.swift */; }; EDC3C2562CCAC9CB005A047F /* SearchEnginesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC3C2552CCAC9CB005A047F /* SearchEnginesManager.swift */; }; EDC3D34F2CB5E70500C62DE3 /* SearchEngineTestAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EDC3D34E2CB5E70500C62DE3 /* SearchEngineTestAssets.xcassets */; }; @@ -1909,7 +1909,6 @@ F8B7109F2ABE38970029726E /* RustErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8B7109D2ABE380B0029726E /* RustErrors.swift */; }; F8B710A02ABE38980029726E /* RustErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8B7109D2ABE380B0029726E /* RustErrors.swift */; }; F8B710A12ABE38980029726E /* RustErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8B7109D2ABE380B0029726E /* RustErrors.swift */; }; - F8DEACC52A3D43DA00C3B19D /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = F8DEACC42A3D43DA00C3B19D /* Sentry */; }; F98CB66E2A4123F1005F38E9 /* EnhancedTrackingProtectionMenuVMTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F98CB66C2A4123E7005F38E9 /* EnhancedTrackingProtectionMenuVMTests.swift */; }; FA6B2AC21D41F02D00429414 /* String+Punycode.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6B2AC11D41F02D00429414 /* String+Punycode.swift */; }; FA6B2AC41D41F02D00429414 /* String+Punycode.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6B2AC11D41F02D00429414 /* String+Punycode.swift */; }; @@ -9523,7 +9522,6 @@ 8A08EC6227EBDCA400E119C7 /* iAd.framework in Frameworks */, 43BE580E278BABCF00491291 /* RustMozillaAppServices.framework in Frameworks */, C82043852523DBF600740B71 /* Sync.framework in Frameworks */, - 5A37861929A2C337006B3A34 /* Sentry in Frameworks */, 8AF2D0FC2A5F272A00C7DD69 /* ComponentLibrary in Frameworks */, 5A871490292EA3910039A5BD /* SiteImageView in Frameworks */, C877037A25222F30006E38EB /* Shared.framework in Frameworks */, @@ -9534,6 +9532,7 @@ E17798A02BD8043800F6F0EB /* ToolbarKit in Frameworks */, E6231C011B90A44F005ABB0D /* libz.tbd in Frameworks */, E4B3348A1BBF23F9004E2BFF /* AdSupport.framework in Frameworks */, + ED6C8DAC2CE6A4BB00D7F7F3 /* Sentry-Dynamic in Frameworks */, 5A984D362C8A3407007938C9 /* Kingfisher in Frameworks */, 819656172C80C6F300E62323 /* MenuKit in Frameworks */, 8AB30EC82B6C038600BD9A9B /* Lottie in Frameworks */, @@ -9557,7 +9556,6 @@ files = ( 43BE5820278BE68100491291 /* RustMozillaAppServices.framework in Frameworks */, 8A8BAE122B2107E400D774EB /* GCDWebServers in Frameworks */, - F8DEACC52A3D43DA00C3B19D /* Sentry in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -14383,7 +14381,6 @@ ); name = Account; packageProductDependencies = ( - F8DEACC42A3D43DA00C3B19D /* Sentry */, 8A8BAE112B2107E400D774EB /* GCDWebServers */, ); productName = Account; @@ -14675,7 +14672,6 @@ 5A87148F292EA3910039A5BD /* SiteImageView */, 5A8FD0EB293A7D5E00333AA7 /* SnapKit */, 5A70EF0D295DFCCF00790249 /* Common */, - 5A37861829A2C337006B3A34 /* Sentry */, 5A06135929D6052E008F3D38 /* TabDataStore */, 216A0D752A40E7AB008077BA /* Redux */, 8AF2D0FB2A5F272A00C7DD69 /* ComponentLibrary */, @@ -14685,6 +14681,7 @@ 5A984D352C8A3407007938C9 /* Kingfisher */, 819656162C80C6F300E62323 /* MenuKit */, EDD2A7F72CDACE7C00ED464C /* UnifiedSearchKit */, + ED6C8DAB2CE6A4BB00D7F7F3 /* Sentry-Dynamic */, ); productName = Client; productReference = F84B21BE1A090F8100AAB793 /* Client.app */; @@ -25681,7 +25678,7 @@ repositoryURL = "https://github.com/getsentry/sentry-cocoa.git"; requirement = { kind = exactVersion; - version = 8.21.0; + version = 8.36.0; }; }; 5A984D322C8A31A0007938C9 /* XCRemoteSwiftPackageReference "Kingfisher" */ = { @@ -25763,11 +25760,6 @@ isa = XCSwiftPackageProductDependency; productName = Common; }; - 5A37861829A2C337006B3A34 /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = 5A37861729A2C337006B3A34 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; 5A37861C29A2C37C006B3A34 /* Common */ = { isa = XCSwiftPackageProductDependency; productName = Common; @@ -25929,6 +25921,11 @@ isa = XCSwiftPackageProductDependency; productName = ToolbarKit; }; + ED6C8DAB2CE6A4BB00D7F7F3 /* Sentry-Dynamic */ = { + isa = XCSwiftPackageProductDependency; + package = 5A37861729A2C337006B3A34 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; + productName = "Sentry-Dynamic"; + }; EDD2A7F72CDACE7C00ED464C /* UnifiedSearchKit */ = { isa = XCSwiftPackageProductDependency; productName = UnifiedSearchKit; @@ -25942,11 +25939,6 @@ package = 5A984D322C8A31A0007938C9 /* XCRemoteSwiftPackageReference "Kingfisher" */; productName = Kingfisher; }; - F8DEACC42A3D43DA00C3B19D /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = 5A37861729A2C337006B3A34 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = F84B21B61A090F8100AAB793 /* Project object */; diff --git a/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 703c3da3ae6f..ebc2643ac325 100644 --- a/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -104,8 +104,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getsentry/sentry-cocoa.git", "state" : { - "revision" : "38f4f70d07117b9f958a76b1bff278c2f29ffe0e", - "version" : "8.21.0" + "revision" : "5575af93efb776414f243e93d6af9f6258dc539a", + "version" : "8.36.0" } }, { diff --git a/focus-ios/Blockzilla.xcodeproj/project.pbxproj b/focus-ios/Blockzilla.xcodeproj/project.pbxproj index fd5b9337d355..22782d46e2ed 100644 --- a/focus-ios/Blockzilla.xcodeproj/project.pbxproj +++ b/focus-ios/Blockzilla.xcodeproj/project.pbxproj @@ -229,6 +229,7 @@ EB84F96F209380CE00BA6739 /* URLExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB84F96E209380CE00BA6739 /* URLExtensions.swift */; }; EB84F9712093815500BA6739 /* effective_tld_names.dat in Resources */ = {isa = PBXBuildFile; fileRef = EB84F9702093815500BA6739 /* effective_tld_names.dat */; }; EBE44F4E20ADDF6A005AFEA6 /* SmartLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE44F4D20ADDF6A005AFEA6 /* SmartLabel.swift */; }; + ED5ACDB02CE6AABF00A55506 /* Sentry-Dynamic in Frameworks */ = {isa = PBXBuildFile; productRef = ED5ACDAF2CE6AABF00A55506 /* Sentry-Dynamic */; }; F74E8109218183F400D18535 /* SearchSuggestionsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74E8108218183F400D18535 /* SearchSuggestionsTest.swift */; }; F7B3E49D2165C32B00118785 /* SearchSuggestionsPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B3E49C2165C32B00118785 /* SearchSuggestionsPromptView.swift */; }; F805722F1DBEE504004339C1 /* WebCacheUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = F805722E1DBEE504004339C1 /* WebCacheUtils.swift */; }; @@ -241,7 +242,6 @@ F861799F27961F4200CFD324 /* InternalSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = F861799E27961F4200CFD324 /* InternalSettings.swift */; }; F86D00612790978700E83177 /* InternalSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F86D00602790978700E83177 /* InternalSettingsView.swift */; }; F8714D2127A1E1F400CEB695 /* InternalCrashReportingSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8714D2027A1E1F400CEB695 /* InternalCrashReportingSettingsView.swift */; }; - F8B92FBE279EC73700183998 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = F8B92FBD279EC73700183998 /* Sentry */; }; F8BC6A0727224B170026AB9F /* NimbusExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8BC6A0627224B170026AB9F /* NimbusExtensions.swift */; }; F8BC6A0927224B890026AB9F /* NimbusWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8BC6A0827224B890026AB9F /* NimbusWrapper.swift */; }; F8DE0EC826CC887800A31419 /* SupportUtilsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8DE0EC726CC887800A31419 /* SupportUtilsTest.swift */; }; @@ -1275,8 +1275,8 @@ CDFA746F27ABD43D0055FE55 /* Glean in Frameworks */, C8FB1E6427F59D9C00C60DC6 /* UIHelpers in Frameworks */, 8A0E7F2E2BA0F0EE006BC6B6 /* Fuzi in Frameworks */, - F8B92FBE279EC73700183998 /* Sentry in Frameworks */, C8FB1E6627F5A79300C60DC6 /* DesignSystem in Frameworks */, + ED5ACDB02CE6AABF00A55506 /* Sentry-Dynamic in Frameworks */, C82F45F728193EE8000D7D84 /* AppShortcuts in Frameworks */, C871586027FB29AC006224BB /* Onboarding in Frameworks */, 451B81BF2BA4DB9F00CF3C50 /* RustMozillaAppServices.framework in Frameworks */, @@ -2123,7 +2123,6 @@ name = Blockzilla; packageProductDependencies = ( F85F7A282655AD5800395515 /* SnapKit */, - F8B92FBD279EC73700183998 /* Sentry */, CDFA746E27ABD43D0055FE55 /* Glean */, C8FB1E6327F59D9C00C60DC6 /* UIHelpers */, C8FB1E6527F5A79300C60DC6 /* DesignSystem */, @@ -2131,6 +2130,7 @@ C82F45F628193EE8000D7D84 /* AppShortcuts */, C809130D2A08F245000889B0 /* Licenses */, 8A0E7F2D2BA0F0EE006BC6B6 /* Fuzi */, + ED5ACDAF2CE6AABF00A55506 /* Sentry-Dynamic */, ); productName = Blockzilla; productReference = E4BF2DD31BACE8CA00DA9D68 /* Firefox Klar.app */; @@ -7200,7 +7200,7 @@ repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { kind = exactVersion; - version = 8.21.0; + version = 8.36.0; }; }; /* End XCRemoteSwiftPackageReference section */ @@ -7246,16 +7246,16 @@ package = CDFA746D27ABD43D0055FE55 /* XCRemoteSwiftPackageReference "glean-swift" */; productName = Glean; }; + ED5ACDAF2CE6AABF00A55506 /* Sentry-Dynamic */ = { + isa = XCSwiftPackageProductDependency; + package = F8B92FBC279EC73700183998 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; + productName = "Sentry-Dynamic"; + }; F85F7A282655AD5800395515 /* SnapKit */ = { isa = XCSwiftPackageProductDependency; package = F8324C2D264C807C007E4BFA /* XCRemoteSwiftPackageReference "SnapKit" */; productName = SnapKit; }; - F8B92FBD279EC73700183998 /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = F8B92FBC279EC73700183998 /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = E4BF2DCB1BACE8CA00DA9D68 /* Project object */; diff --git a/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f8dd3d8c69ed..4ab0cc1a77cb 100644 --- a/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -28,7 +28,7 @@ "version": null } }, - { + { "package": "Glean", "repositoryURL": "https://github.com/mozilla/glean-swift", "state": { @@ -46,7 +46,7 @@ "version": "7.12.0" } }, - { + { "package": "MozillaRustComponentsSwift", "repositoryURL": "https://github.com/mozilla/rust-components-swift", "state": { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/getsentry/sentry-cocoa", "state": { "branch": null, - "revision": "38f4f70d07117b9f958a76b1bff278c2f29ffe0e", - "version": "8.21.0" + "revision": "5575af93efb776414f243e93d6af9f6258dc539a", + "version": "8.36.0" } }, {