From f5b8983fff680642425a3f75636b25665c020284 Mon Sep 17 00:00:00 2001 From: David Harbage Date: Fri, 20 Sep 2024 14:40:23 -0400 Subject: [PATCH 1/5] Update project.pbxproj --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 192ec061e5..e74522f643 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10926,8 +10926,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 197.0.0; + branch = dharb/bump-c-s-s; + kind = branch; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { From 20150ba836bae0a7a6e2fcef9aa7c04feb837ef1 Mon Sep 17 00:00:00 2001 From: David Harbage Date: Fri, 20 Sep 2024 14:46:33 -0400 Subject: [PATCH 2/5] Update 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 8ef30ff3b2..d1d2d28079 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" : "40f2fcc23944e028e16798a784ceff7e24ba6683", - "version" : "197.0.0" + "branch" : "dharb/bump-c-s-s", + "revision" : "e9c967f990fd54e5177a3d88d60eec0980c7d787" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "revision" : "9f3717b3913a12956f1386fe7b657f68545fba83", - "version" : "6.15.0" + "branch" : "pr-releases/pr-1026", + "revision" : "06b4a9de1efc8b247607b06a02cec034e6578bf9" } }, { From 05ef3e758899f8917efbeb22f34fad9b7eb8da8f Mon Sep 17 00:00:00 2001 From: David Harbage Date: Wed, 25 Sep 2024 16:15:22 -0400 Subject: [PATCH 3/5] Update Package.resolved --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d1d2d28079..e9faa8d679 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" : { - "branch" : "pr-releases/pr-1026", - "revision" : "06b4a9de1efc8b247607b06a02cec034e6578bf9" + "revision" : "1ed569676555d493c9c5575eaed22aa02569aac9", + "version" : "6.19.0" } }, { From 416dd8041ce51ad0f81e1ab950b815b4166e69af Mon Sep 17 00:00:00 2001 From: David Harbage Date: Wed, 25 Sep 2024 16:21:42 -0400 Subject: [PATCH 4/5] Update Package.resolved --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e9faa8d679..8f668a2c7c 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,7 +33,7 @@ "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { "branch" : "dharb/bump-c-s-s", - "revision" : "e9c967f990fd54e5177a3d88d60eec0980c7d787" + "revision" : "f1df2d7eb87379a263db7bb02d3cca1fc631b257" } }, { From 15fa048e44f6b00e9ff037bd47ceac7974cb33e5 Mon Sep 17 00:00:00 2001 From: David Harbage Date: Wed, 25 Sep 2024 16:33:53 -0400 Subject: [PATCH 5/5] Update Package.resolved --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 45c745d0f4..e867798535 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,7 +33,7 @@ "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { "branch" : "dharb/bump-c-s-s", - "revision" : "f1df2d7eb87379a263db7bb02d3cca1fc631b257" + "revision" : "2a124923344a586252a019c3e2e90c8f898a8413" } }, {