From 122833baaa6f7c55545bd68d15fa765c817d02e1 Mon Sep 17 00:00:00 2001 From: Tomas Strba Date: Mon, 21 Oct 2024 22:42:47 +0200 Subject: [PATCH 1/3] NullHistoryCoordinator change required for compilation --- Core/HistoryManager.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Core/HistoryManager.swift b/Core/HistoryManager.swift index 0020468071..1fac8adb31 100644 --- a/Core/HistoryManager.swift +++ b/Core/HistoryManager.swift @@ -145,6 +145,10 @@ class NullHistoryCoordinator: HistoryCoordinating { completion() } + func removeUrlEntry(_ url: URL, completion: (((any Error)?) -> Void)?) { + completion?(nil) + } + } public class HistoryDatabase { From c9542d626914c0f3477ce3bf66dbad915767386f Mon Sep 17 00:00:00 2001 From: Tomas Strba Date: Mon, 21 Oct 2024 22:44:27 +0200 Subject: [PATCH 2/3] BSK --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 18b1989652..e89a0ec5ba 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10945,8 +10945,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 199.3.0; + branch = "tom/suggestion-removal"; + kind = branch; }; }; 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 bd1a9538f4..631df2d194 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" : "4b5e53fc8ae617247063eb2732f4db89234a5b3b", - "version" : "199.3.0" + "branch" : "tom/suggestion-removal", + "revision" : "f6bbe435ba41a549e7ea589402a25c3844b5c3aa" } }, { From e29baff73d6725e87a3174eacc1329fc9fbacd43 Mon Sep 17 00:00:00 2001 From: Tomas Strba Date: Wed, 30 Oct 2024 10:12:29 +0100 Subject: [PATCH 3/3] Package.resolved --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7237aea6a2..631df2d194 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "revision" : "b74549bd869fdecc16fad851f2f608b1724764df", - "version" : "6.25.0" + "revision" : "1ed569676555d493c9c5575eaed22aa02569aac9", + "version" : "6.19.0" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/duckduckgo-autofill.git", "state" : { - "revision" : "945ac09a0189dc6736db617867fde193ea984b20", - "version" : "15.0.0" + "revision" : "1fee787458d13f8ed07f9fe81aecd6e59609339e", + "version" : "13.1.0" } }, {