From fe788530993f6a9d948a04d37747a9ead8d808b2 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Wed, 24 Jul 2024 16:46:51 +0600 Subject: [PATCH 1/3] rollback CrashLogMessageExtractor with disabled __cxa_throw swapper --- DuckDuckGo/AppDelegate.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift index 1d84119be4..3111c1461b 100644 --- a/DuckDuckGo/AppDelegate.swift +++ b/DuckDuckGo/AppDelegate.swift @@ -100,6 +100,12 @@ import WebKit override init() { super.init() + + if !didCrashDuringCrashHandlersSetUp { + didCrashDuringCrashHandlersSetUp = true + CrashLogMessageExtractor.setUp(swapCxaThrow: false) + didCrashDuringCrashHandlersSetUp = false + } } // swiftlint:disable:next function_body_length From a10db8a7231c63da666f09672e8f212643859046 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 2 Aug 2024 14:46:54 +0600 Subject: [PATCH 2/3] BSK -> 176.1.1-1 --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- submodules/privacy-reference-tests | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index d7cfce8efa..cd893c6946 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10206,7 +10206,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 176.1.1; + version = "176.1.1-1"; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 67fa8421c6..0b740e8f12 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" } }, { diff --git a/submodules/privacy-reference-tests b/submodules/privacy-reference-tests index afb4f6128a..a603ff9af2 160000 --- a/submodules/privacy-reference-tests +++ b/submodules/privacy-reference-tests @@ -1 +1 @@ -Subproject commit afb4f6128a3b50d53ddcb1897ea1fb4df6858aa1 +Subproject commit a603ff9af22ca3ff7ce2e7ffbfe18c447d9f23e8 From 77944fad47323ae24d06087e91cfca2a4cbff1da Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 2 Aug 2024 14:47:56 +0600 Subject: [PATCH 3/3] rollback submodules/privacy-reference-tests --- submodules/privacy-reference-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/privacy-reference-tests b/submodules/privacy-reference-tests index a603ff9af2..afb4f6128a 160000 --- a/submodules/privacy-reference-tests +++ b/submodules/privacy-reference-tests @@ -1 +1 @@ -Subproject commit a603ff9af22ca3ff7ce2e7ffbfe18c447d9f23e8 +Subproject commit afb4f6128a3b50d53ddcb1897ea1fb4df6858aa1