From 9858928f7c34dc1be3287c925ace63cfcb6a9deb Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Tue, 16 Apr 2024 15:06:51 -0700 Subject: [PATCH 1/2] Use BSK branch. --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 17 ++++------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index dafc69c97d..faab4a3735 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10176,8 +10176,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = "134.1.0-1"; + branch = "sam/remove-validator"; + 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 840147d333..6be944ef20 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" : "543398a776f522998918eefd3df4150fae041838", - "version" : "134.1.0-1" + "branch" : "sam/remove-validator", + "revision" : "c1826f02b1d5c91ed366033201274a8133ff2e95" } }, { @@ -135,15 +135,6 @@ "version" : "2.1.0" } }, - { - "identity" : "swift-argument-parser", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-argument-parser", - "state" : { - "revision" : "46989693916f56d1186bd59ac15124caef896560", - "version" : "1.3.1" - } - }, { "identity" : "swift-syntax", "kind" : "remoteSourceControl", @@ -185,8 +176,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/TrackerRadarKit", "state" : { - "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff", - "version" : "1.2.2" + "branch" : "sam/remove-validator", + "revision" : "fe3fea9a42478692e796f046d5ae91bdd15bdc17" } }, { From 376d324bcd23e27ae79f9d5d1ba4924738c6bead Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Wed, 17 Apr 2024 08:15:36 -0700 Subject: [PATCH 2/2] Set BSK to 135.0.0. --- 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 faab4a3735..007b4b5de3 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10176,8 +10176,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - branch = "sam/remove-validator"; - kind = branch; + kind = exactVersion; + version = 135.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 6be944ef20..167edf9dd2 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" : { - "branch" : "sam/remove-validator", - "revision" : "c1826f02b1d5c91ed366033201274a8133ff2e95" + "revision" : "5821f7094190dbb5bd4f75758c4560f72518056b", + "version" : "135.0.0" } }, { @@ -176,8 +176,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/TrackerRadarKit", "state" : { - "branch" : "sam/remove-validator", - "revision" : "fe3fea9a42478692e796f046d5ae91bdd15bdc17" + "revision" : "6c84fd19139414fc0edbf9673ade06e532a564f0", + "version" : "2.0.0" } }, {