From e9a4efd89dc3584f11ecd060513cefbdeecd9c84 Mon Sep 17 00:00:00 2001 From: Brian Hall Date: Wed, 4 Sep 2024 13:03:09 +0200 Subject: [PATCH 1/3] Bump BSK with C-S-S to 6.14.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 7a750df936..76fbf70e47 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10672,8 +10672,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 191.1.0; + kind = branch; + branch = "bhall/bump-c-s-s-to-6.14.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 2e3e95fb80..94815d7236 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" : "afdab422a36d6ab20ab08a407927f0e50d683ff5", - "version" : "191.1.0" + "branch" : "bhall/bump-c-s-s-to-6.14.0", + "revision" : "6fb731805b93385cc8dc8a07c6875c3c831165b2" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "revision" : "5876a5d2e2e7f5a2e11f6419c6c3fafb7cafdfca", - "version" : "6.12.0" + "revision" : "1164f9579d226cf16c0c1c79c0928f28a4f3c421", + "version" : "6.14.0" } }, { From 741b0338be7b72e4f6590343631be40329058289 Mon Sep 17 00:00:00 2001 From: Brian Hall Date: Wed, 4 Sep 2024 15:22:09 +0200 Subject: [PATCH 2/3] Bump to correct version --- 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 76fbf70e47..1acd59e684 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10672,8 +10672,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = branch; - branch = "bhall/bump-c-s-s-to-6.14.0"; + kind = exactVersion; + version = "191.2.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 94815d7236..4591fc8676 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" : "bhall/bump-c-s-s-to-6.14.0", - "revision" : "6fb731805b93385cc8dc8a07c6875c3c831165b2" + "revision" : "2d20fafba4430f49249521735b951f21e20ec0c3", + "version" : "191.2.0" } }, { From 14df0bfd5508756ac85af3b451c962481c1a8121 Mon Sep 17 00:00:00 2001 From: Brian Hall Date: Wed, 4 Sep 2024 15:23:10 +0200 Subject: [PATCH 3/3] Remove quotes --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 1acd59e684..a56b46e94a 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10673,7 +10673,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = "191.2.0"; + version = 191.2.0; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {