From ba2a7d423b3cadbea8a81eb108b5117feabe96d9 Mon Sep 17 00:00:00 2001 From: Sabrina Tardio Date: Wed, 16 Aug 2023 13:32:18 +0200 Subject: [PATCH 1/2] update BSK dependency --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 48d0fec15c..ab95c3c48f 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10214,8 +10214,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 74.0.1; + branch = "sabrina/extend-isValidURL-to-include-IPv6"; + kind = branch; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index caa11bcaaa..7ef388a968 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" : "da6b1eac1d4b4416eb82fb5648519aa5cb363a17", - "version" : "74.0.1" + "branch" : "sabrina/extend-isValidURL-to-include-IPv6", + "revision" : "c41ea5e8258e82cc6a5b4f2da2673adff6186cd6" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "revision" : "a4f35ad23ac4a0eb9b36b94f1f2aa0f0ebf2855d", - "version" : "4.30.0" + "revision" : "8def15fe8a4c2fb76730f640507e9fd1d6c1f8a7", + "version" : "4.32.0" } }, { @@ -129,7 +129,7 @@ { "identity" : "trackerradarkit", "kind" : "remoteSourceControl", - "location" : "https://github.com/duckduckgo/TrackerRadarKit", + "location" : "https://github.com/duckduckgo/TrackerRadarKit.git", "state" : { "revision" : "4684440d03304e7638a2c8086895367e90987463", "version" : "1.2.1" From b7c661f3f1a10cc8cbcd6c733a14fb6a3d94f6c1 Mon Sep 17 00:00:00 2001 From: Sabrina Tardio Date: Mon, 21 Aug 2023 13:44:09 +0200 Subject: [PATCH 2/2] point to BSK 75.0.2 --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- LocalPackages/NetworkProtectionUI/Package.swift | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index ab95c3c48f..1a5813df5b 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10214,8 +10214,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - branch = "sabrina/extend-isValidURL-to-include-IPv6"; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 75.0.2; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7ef388a968..a0404bd723 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" : "sabrina/extend-isValidURL-to-include-IPv6", - "revision" : "c41ea5e8258e82cc6a5b4f2da2673adff6186cd6" + "revision" : "8d4c3d884762d954183a9496961b87d254b43539", + "version" : "75.0.2" } }, { @@ -140,8 +140,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/wireguard-apple", "state" : { - "revision" : "cf3c0f5132dbb8de08c46155a1bbd5e5bb6a47c1", - "version" : "1.1.0" + "revision" : "2d8172c11478ab11b0f5ad49bdb4f93f4b3d5e0d", + "version" : "1.1.1" } } ], diff --git a/LocalPackages/NetworkProtectionUI/Package.swift b/LocalPackages/NetworkProtectionUI/Package.swift index ee4f861bdf..c5181eff24 100644 --- a/LocalPackages/NetworkProtectionUI/Package.swift +++ b/LocalPackages/NetworkProtectionUI/Package.swift @@ -15,7 +15,7 @@ let package = Package( targets: ["NetworkProtectionUI"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "74.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "75.0.2"), .package(path: "../SwiftUIExtensions") ], targets: [