From 021754869df84a0bdd90bbad3200ddd254af8815 Mon Sep 17 00:00:00 2001 From: Anh Do Date: Thu, 21 Mar 2024 18:07:30 -0400 Subject: [PATCH 1/4] Update BSK --- 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 865d5ee23e..ff5cba582b 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -14108,8 +14108,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 129.1.0; + branch = "anh/pp/add-metadata"; + 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 1d7f2f7fee..5a5c858ec9 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" : "2f64ae6ce5aee5d648258eef5a5b39e61b9bd8e3", - "version" : "129.1.0" + "branch" : "anh/pp/add-metadata", + "revision" : "a1890713d0e08d2a68f7c6d6c8ac995c4f2e183b" } }, { From 6ba555b780f0721a5418dc256d9ea16c54e4df6a Mon Sep 17 00:00:00 2001 From: Anh Do Date: Thu, 21 Mar 2024 18:15:03 -0400 Subject: [PATCH 2/4] Update BSK --- .../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 5a5c858ec9..69249300a1 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" : "anh/pp/add-metadata", - "revision" : "a1890713d0e08d2a68f7c6d6c8ac995c4f2e183b" + "revision" : "0cba47cf651175806bc151366605f8b19802d3ee" } }, { @@ -165,7 +165,7 @@ { "identity" : "trackerradarkit", "kind" : "remoteSourceControl", - "location" : "https://github.com/duckduckgo/TrackerRadarKit.git", + "location" : "https://github.com/duckduckgo/TrackerRadarKit", "state" : { "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff", "version" : "1.2.2" From 7c96f324d551b8989524033ee148a6001b6aac14 Mon Sep 17 00:00:00 2001 From: Anh Do Date: Thu, 21 Mar 2024 18:22:11 -0400 Subject: [PATCH 3/4] Move anonymousDescription inside BSK --- .../VPNMetadataCollector.swift | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift b/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift index e1c071de4e..678b29970b 100644 --- a/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift +++ b/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift @@ -287,25 +287,4 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector { } -extension Network.NWPath { - /// A description that's safe from a privacy standpoint. - /// - /// Ref: https://app.asana.com/0/0/1206712493935053/1206712516729780/f - /// - var anonymousDescription: String { - var description = "NWPath(" - - description += "status: \(status), " - - if case .unsatisfied = status { - description += "unsatisfiedReason: \(unsatisfiedReason), " - } - - description += "availableInterfaces: \(availableInterfaces)" - description += ")" - - return description - } -} - #endif From 9085f1fe297a5b50263fa1de8d9172b6ff1c7575 Mon Sep 17 00:00:00 2001 From: Anh Do Date: Mon, 25 Mar 2024 00:44:43 -0400 Subject: [PATCH 4/4] Update BSK --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- LocalPackages/DataBrokerProtection/Package.swift | 2 +- LocalPackages/NetworkProtectionMac/Package.swift | 2 +- LocalPackages/SubscriptionUI/Package.swift | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 136f0f1376..12cb453fdc 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -14152,8 +14152,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - branch = "anh/pp/add-metadata"; - kind = branch; + kind = exactVersion; + version = 129.1.6; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 30cf8bff57..9ff6f99b17 100644 --- a/LocalPackages/DataBrokerProtection/Package.swift +++ b/LocalPackages/DataBrokerProtection/Package.swift @@ -29,7 +29,7 @@ let package = Package( targets: ["DataBrokerProtection"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "129.1.4"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "129.1.6"), .package(path: "../PixelKit"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper"), diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index 522e91d522..b095f7ec52 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -31,7 +31,7 @@ let package = Package( .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "129.1.4"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "129.1.6"), .package(path: "../XPCHelper"), .package(path: "../SwiftUIExtensions"), .package(path: "../LoginItems"), diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift index a0a9fbbe59..02536be85b 100644 --- a/LocalPackages/SubscriptionUI/Package.swift +++ b/LocalPackages/SubscriptionUI/Package.swift @@ -12,7 +12,7 @@ let package = Package( targets: ["SubscriptionUI"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "129.1.4"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "129.1.6"), .package(path: "../SwiftUIExtensions") ], targets: [