From cd1e6e2cb937edc1bae0b4c4b88b7b354684ac17 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Fri, 9 Feb 2024 11:51:32 -0800 Subject: [PATCH 1/4] Update BSK to use branch ref. --- 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 8a62e8e494..4764614f2d 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10004,8 +10004,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 105.0.0; + branch = "sam/increase-tunnel-monitor-check-interval"; + 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 7b5e6890b5..b36793947b 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "c14f36805fc5c4c8ec68198fc1ce7e0e0a97e233", - "version" : "105.0.0" + "branch" : "sam/increase-tunnel-monitor-check-interval", + "revision" : "4908e8482b501bca21849073ce40d8deee2d579f" } }, { From 524952bfece6e98163a9f6ac4fa69c1e05f3b475 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Mon, 12 Feb 2024 18:30:10 -0800 Subject: [PATCH 2/4] Update BSK ref. --- .../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 b36793947b..5b0cbe368d 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,7 +15,7 @@ "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { "branch" : "sam/increase-tunnel-monitor-check-interval", - "revision" : "4908e8482b501bca21849073ce40d8deee2d579f" + "revision" : "fc7f6324e7798a17d5847699dbe79d51c88d7aab" } }, { From df175f59902f164df71e8a532bee3d15fd83c835 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Mon, 12 Feb 2024 18:43:54 -0800 Subject: [PATCH 3/4] Update BSK ref. --- .../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 5b0cbe368d..2d9edcfc58 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,7 +15,7 @@ "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { "branch" : "sam/increase-tunnel-monitor-check-interval", - "revision" : "fc7f6324e7798a17d5847699dbe79d51c88d7aab" + "revision" : "ba55aa7f30bf43e842c5e347463e9cc5fab917cb" } }, { From cc50ccf88b4e29847af3cb58a4b7eee164fefed3 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Mon, 12 Feb 2024 19:05:45 -0800 Subject: [PATCH 4/4] Update BSK version. --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- LocalPackages/DuckUI/Package.swift | 2 +- LocalPackages/SyncUI/Package.swift | 2 +- LocalPackages/Waitlist/Package.swift | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 4764614f2d..bb1472bf42 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10004,8 +10004,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - branch = "sam/increase-tunnel-monitor-check-interval"; - kind = branch; + kind = exactVersion; + version = 106.0.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 2d9edcfc58..7e74a98bef 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "branch" : "sam/increase-tunnel-monitor-check-interval", - "revision" : "ba55aa7f30bf43e842c5e347463e9cc5fab917cb" + "revision" : "3f5e33ec3d75dd2c130cfc6915c0a6e8efeb96f1", + "version" : "106.0.1" } }, { diff --git a/LocalPackages/DuckUI/Package.swift b/LocalPackages/DuckUI/Package.swift index 0e8afdefb8..9765ab738d 100644 --- a/LocalPackages/DuckUI/Package.swift +++ b/LocalPackages/DuckUI/Package.swift @@ -31,7 +31,7 @@ let package = Package( targets: ["DuckUI"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "106.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "106.0.1"), ], targets: [ .target( diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift index 873f398e8b..aa8c6af19b 100644 --- a/LocalPackages/SyncUI/Package.swift +++ b/LocalPackages/SyncUI/Package.swift @@ -33,7 +33,7 @@ let package = Package( ], dependencies: [ .package(path: "../DuckUI"), - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "106.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "106.0.1"), .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0") ], targets: [ diff --git a/LocalPackages/Waitlist/Package.swift b/LocalPackages/Waitlist/Package.swift index c299bcce08..2d0a802dba 100644 --- a/LocalPackages/Waitlist/Package.swift +++ b/LocalPackages/Waitlist/Package.swift @@ -15,7 +15,7 @@ let package = Package( targets: ["Waitlist", "WaitlistMocks"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "106.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "106.0.1"), .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0") ], targets: [