From af5a5819595d1be83df7e680cd141d1246040af1 Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Mon, 27 Nov 2023 15:57:04 +0100 Subject: [PATCH 1/2] Fix migrating from Bookmarks V2 and older --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 386610fafa..1648040037 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9198,8 +9198,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 85.1.0; + branch = "bartek/fix-migration-crash"; + kind = branch; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b369637cf4..3f0f336ccf 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,9 +14,9 @@ "package": "BrowserServicesKit", "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit", "state": { - "branch": null, - "revision": "820203512819e81c4dd5ff0b53711d0010a8253c", - "version": "85.1.0" + "branch": "bartek/fix-migration-crash", + "revision": "550e309a17c60f5f0f7981f4b5d2773afeca2033", + "version": null } }, { @@ -156,7 +156,7 @@ }, { "package": "TrackerRadarKit", - "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit", + "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit.git", "state": { "branch": null, "revision": "4684440d03304e7638a2c8086895367e90987463", From 35d63b3810cbb56852526633fe5adecdd25465c0 Mon Sep 17 00:00:00 2001 From: Chris Brind Date: Mon, 27 Nov 2023 16:33:29 +0000 Subject: [PATCH 2/2] point to latest BSK with migrations fix --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 1648040037..b1832a4068 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9198,8 +9198,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - branch = "bartek/fix-migration-crash"; - kind = branch; + kind = exactVersion; + version = 85.1.1; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3f0f336ccf..1eb97f222f 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,9 +14,9 @@ "package": "BrowserServicesKit", "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit", "state": { - "branch": "bartek/fix-migration-crash", - "revision": "550e309a17c60f5f0f7981f4b5d2773afeca2033", - "version": null + "branch": null, + "revision": "543e1d7ed9b5743d4e6b0ebe18a5fbf8f1441f02", + "version": "85.1.1" } }, { @@ -156,7 +156,7 @@ }, { "package": "TrackerRadarKit", - "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit.git", + "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit", "state": { "branch": null, "revision": "4684440d03304e7638a2c8086895367e90987463",