From 9d3cc61c7af3c78302812b64fe746683d46bdba4 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 2 Aug 2024 15:08:22 +0600 Subject: [PATCH] restore CrashLogMessageExtractor (#3011) Task/Issue URL: https://app.asana.com/0/414709148257752/1207878606354585/f BSK PR: https://github.com/duckduckgo/BrowserServicesKit/pull/909 iOS PR: https://github.com/duckduckgo/iOS/pull/3133 --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- DuckDuckGo/Application/AppDelegate.swift | 2 +- LocalPackages/DataBrokerProtection/Package.swift | 2 +- LocalPackages/NetworkProtectionMac/Package.swift | 2 +- LocalPackages/SubscriptionUI/Package.swift | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 78349e3177..0029145880 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -13410,7 +13410,7 @@ repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 176.1.1; + version = "176.1.1-1"; }; }; 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 2137c9a58f..58ec9cbfa2 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "a3e62d6c295063f757ef7dc2f96b6a57a503f0f5", - "version" : "176.1.1" + "revision" : "7325384a51085d470607427e4555acc3d0fba1a6", + "version" : "176.1.1-1" } }, { @@ -75,7 +75,7 @@ { "identity" : "lottie-spm", "kind" : "remoteSourceControl", - "location" : "https://github.com/airbnb/lottie-spm.git", + "location" : "https://github.com/airbnb/lottie-spm", "state" : { "revision" : "1d29eccc24cc8b75bff9f6804155112c0ffc9605", "version" : "4.4.3" diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift index db19fdf2c3..e142f9cd31 100644 --- a/DuckDuckGo/Application/AppDelegate.swift +++ b/DuckDuckGo/Application/AppDelegate.swift @@ -159,7 +159,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate { !didCrashDuringCrashHandlersSetUp.wrappedValue { didCrashDuringCrashHandlersSetUp.wrappedValue = true - CrashLogMessageExtractor.setUp() + CrashLogMessageExtractor.setUp(swapCxaThrow: false) didCrashDuringCrashHandlersSetUp.wrappedValue = false } diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 36a12d0d40..bca2681db5 100644 --- a/LocalPackages/DataBrokerProtection/Package.swift +++ b/LocalPackages/DataBrokerProtection/Package.swift @@ -29,7 +29,7 @@ let package = Package( targets: ["DataBrokerProtection"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "176.1.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "176.1.1-1"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper"), ], diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index 814636de85..4abae437d3 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -32,7 +32,7 @@ let package = Package( .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "176.1.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "176.1.1-1"), .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"), .package(path: "../AppLauncher"), .package(path: "../UDSHelper"), diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift index 9c2173e1ee..655700923b 100644 --- a/LocalPackages/SubscriptionUI/Package.swift +++ b/LocalPackages/SubscriptionUI/Package.swift @@ -12,7 +12,7 @@ let package = Package( targets: ["SubscriptionUI"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "176.1.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "176.1.1-1"), .package(path: "../SwiftUIExtensions") ], targets: [