From 47d861b7312c8d16052f3d0ffc5420983cd0c96b Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Thu, 12 Sep 2024 13:26:38 +0600 Subject: [PATCH 1/2] update for macOS: visited links --- Core/HistoryManager.swift | 6 +++--- Core/SyncErrorHandler.swift | 6 +++--- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 5 ++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Core/HistoryManager.swift b/Core/HistoryManager.swift index 272bee87dd..0020468071 100644 --- a/Core/HistoryManager.swift +++ b/Core/HistoryManager.swift @@ -88,7 +88,7 @@ public class HistoryManager: HistoryManaging { let baseDomain = tld.eTLDplus1(domain) else { return } await withCheckedContinuation { continuation in - historyCoordinator.burnDomains([baseDomain], tld: tld) { + historyCoordinator.burnDomains([baseDomain], tld: tld) { _ in continuation.resume() } } @@ -137,8 +137,8 @@ class NullHistoryCoordinator: HistoryCoordinating { completion() } - func burnDomains(_ baseDomains: Set, tld: Common.TLD, completion: @escaping () -> Void) { - completion() + func burnDomains(_ baseDomains: Set, tld: Common.TLD, completion: @escaping (Set) -> Void) { + completion([]) } func burnVisits(_ visits: [History.Visit], completion: @escaping () -> Void) { diff --git a/Core/SyncErrorHandler.swift b/Core/SyncErrorHandler.swift index 3c29fb3a99..a3ff07e794 100644 --- a/Core/SyncErrorHandler.swift +++ b/Core/SyncErrorHandler.swift @@ -39,21 +39,21 @@ public enum AsyncErrorType: String { public class SyncErrorHandler: EventMapping { @UserDefaultsWrapper(key: .syncBookmarksPaused, defaultValue: false) - private (set) public var isSyncBookmarksPaused: Bool { + private(set) public var isSyncBookmarksPaused: Bool { didSet { isSyncPausedChangedPublisher.send() } } @UserDefaultsWrapper(key: .syncCredentialsPaused, defaultValue: false) - private (set) public var isSyncCredentialsPaused: Bool { + private(set) public var isSyncCredentialsPaused: Bool { didSet { isSyncPausedChangedPublisher.send() } } @UserDefaultsWrapper(key: .syncIsPaused, defaultValue: false) - private (set) public var isSyncPaused: Bool { + private(set) public var isSyncPaused: Bool { didSet { isSyncPausedChangedPublisher.send() } diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 7f7abe48dc..60d908ffba 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10852,8 +10852,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 193.0.3; + kind = revision; + revision = 835b51b3e37af09894d7a789e34b72a482a52971; }; }; 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 ef85291655..cf9621e67a 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "c68e68a0036796628ffdea8d449e5df39ceceb4d", - "version" : "193.0.3" + "revision" : "835b51b3e37af09894d7a789e34b72a482a52971" } }, { @@ -138,7 +137,7 @@ { "identity" : "swift-argument-parser", "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-argument-parser.git", + "location" : "https://github.com/apple/swift-argument-parser", "state" : { "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b", "version" : "1.4.0" From e38b29e4152cecb3060b4dcbb210c2eb9f26235c Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 13 Sep 2024 13:57:39 +0600 Subject: [PATCH 2/2] BSK -> 194.0.0 --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 60d908ffba..e4d39f99ee 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10852,8 +10852,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = revision; - revision = 835b51b3e37af09894d7a789e34b72a482a52971; + kind = exactVersion; + version = 194.0.0; }; }; 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 cf9621e67a..e9a096fca1 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,7 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "835b51b3e37af09894d7a789e34b72a482a52971" + "revision" : "026acbd36fb80c95e0bfc6a9080e369dd85db66f", + "version" : "194.0.0" } }, {