From 081ba9d2dadf62b7aa942e8dec1769202522f767 Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Wed, 14 Feb 2024 15:20:32 -0600 Subject: [PATCH 1/8] Update breakage report API --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 3 +-- .../PrivacyDashboardViewController.swift | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 4902911bc7..8eebd6f443 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9891,8 +9891,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 107.0.0; + kind = revision; + revision = 78caab092cbda6b2f5b5f43430e2ae4e137b9ebd; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index ae8e29e12e..52de6c7405 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "328ce451fd1593809d1470ab5a0b5242a595f88c", - "version" : "107.0.0" + "revision" : "78caab092cbda6b2f5b5f43430e2ae4e137b9ebd" } }, { diff --git a/DuckDuckGo/PrivacyDashboard/PrivacyDashboardViewController.swift b/DuckDuckGo/PrivacyDashboard/PrivacyDashboardViewController.swift index 586c8e99d9..68521a29dd 100644 --- a/DuckDuckGo/PrivacyDashboard/PrivacyDashboardViewController.swift +++ b/DuckDuckGo/PrivacyDashboard/PrivacyDashboardViewController.swift @@ -237,7 +237,16 @@ extension PrivacyDashboardViewController { let blockedTrackerDomains = privacyInfo.trackerInfo.trackersBlocked.compactMap { $0.domain } let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig let protectionsState = configuration.isFeature(.contentBlocking, enabledForDomain: breakageAdditionalInfo.currentURL.host) - + + var errors: [Error]? + var statusCodes: [Int]? + if let error = breakageAdditionalInfo.error { + errors = [error] + } + if let httpStatusCode = breakageAdditionalInfo.httpStatusCode { + statusCodes = [httpStatusCode] + } + return WebsiteBreakage(siteUrl: breakageAdditionalInfo.currentURL, category: category, description: description, @@ -255,7 +264,7 @@ extension PrivacyDashboardViewController { siteType: breakageAdditionalInfo.isDesktop ? .desktop : .mobile, atb: StatisticsUserDefaults().atb ?? "", model: UIDevice.current.model, - error: breakageAdditionalInfo.error, - httpStatusCode: breakageAdditionalInfo.httpStatusCode) + errors: errors, + httpStatusCodes: statusCodes) } } From 3501537225b49b27677b90613d2a3ee61c4ead60 Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Thu, 15 Feb 2024 09:42:55 -0600 Subject: [PATCH 2/8] Fix tests --- DuckDuckGoTests/BrokenSiteReportingTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DuckDuckGoTests/BrokenSiteReportingTests.swift b/DuckDuckGoTests/BrokenSiteReportingTests.swift index 838b3478bf..d280eae7a1 100644 --- a/DuckDuckGoTests/BrokenSiteReportingTests.swift +++ b/DuckDuckGoTests/BrokenSiteReportingTests.swift @@ -91,8 +91,8 @@ final class BrokenSiteReportingTests: XCTestCase { siteType: .mobile, atb: "", model: test.model ?? "", - error: nil, - httpStatusCode: nil) + errors: nil, + httpStatusCodes: nil) let reporter = WebsiteBreakageReporter(pixelHandler: { params in From 6c5390b096ab8036f07cdc54ae60779a55795add Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Thu, 15 Feb 2024 10:26:12 -0600 Subject: [PATCH 3/8] Update BSK --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- LocalPackages/DuckUI/Package.swift | 2 +- LocalPackages/SyncUI/Package.swift | 2 +- LocalPackages/Waitlist/Package.swift | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 8eebd6f443..9ef64b2980 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9892,7 +9892,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = revision; - revision = 78caab092cbda6b2f5b5f43430e2ae4e137b9ebd; + revision = 104ad60a0daa73720c665cbdb9bca894ab6c6af6; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 52de6c7405..c8ee625d87 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,7 +14,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "78caab092cbda6b2f5b5f43430e2ae4e137b9ebd" + "revision" : "104ad60a0daa73720c665cbdb9bca894ab6c6af6" } }, { diff --git a/LocalPackages/DuckUI/Package.swift b/LocalPackages/DuckUI/Package.swift index 168afca2ae..efd99b6aa4 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: "107.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "104ad60a0daa73720c665cbdb9bca894ab6c6af6"), ], targets: [ .target( diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift index efff9ba53e..5a3ab5cff1 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: "107.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "104ad60a0daa73720c665cbdb9bca894ab6c6af6"), .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 1984628127..770a0aba4a 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: "107.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "104ad60a0daa73720c665cbdb9bca894ab6c6af6"), .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0") ], targets: [ From f97cfa2b4c39b8cf3612db21a1fa9511b30d6311 Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Thu, 15 Feb 2024 12:49:31 -0600 Subject: [PATCH 4/8] Update broken site reference tests --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 2 +- .../BrokenSiteReportingTests.swift | 44 ++++++++++++++++--- LocalPackages/DuckUI/Package.swift | 2 +- LocalPackages/SyncUI/Package.swift | 2 +- LocalPackages/Waitlist/Package.swift | 2 +- submodules/privacy-reference-tests | 2 +- 7 files changed, 45 insertions(+), 11 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 9ef64b2980..6d193fada5 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9892,7 +9892,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = revision; - revision = 104ad60a0daa73720c665cbdb9bca894ab6c6af6; + revision = c92ba4693258d043fe78ef53d1e07a688b0d6fda; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index c8ee625d87..2b13d49752 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,7 +14,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "104ad60a0daa73720c665cbdb9bca894ab6c6af6" + "revision" : "c92ba4693258d043fe78ef53d1e07a688b0d6fda" } }, { diff --git a/DuckDuckGoTests/BrokenSiteReportingTests.swift b/DuckDuckGoTests/BrokenSiteReportingTests.swift index d280eae7a1..e5871f869a 100644 --- a/DuckDuckGoTests/BrokenSiteReportingTests.swift +++ b/DuckDuckGoTests/BrokenSiteReportingTests.swift @@ -38,6 +38,22 @@ final class BrokenSiteReportingTests: XCTestCase { static let tests = "privacy-reference-tests/broken-site-reporting/tests.json" } + struct MockError: LocalizedError { + let description: String + + init(_ description: String) { + self.description = description + } + + var errorDescription: String? { + description + } + + var localizedDescription: String? { + description + } + } + override func setUp() { super.setUp() @@ -73,10 +89,19 @@ final class BrokenSiteReportingTests: XCTestCase { } os_log("Testing [%s]", type: .info, test.name) - + + var errors: [Error]? + var statusCodes: [Int]? + if let error = test.errorDescription { + errors = [MockError(error)] + } + if let httpStatusCode = test.httpStatusCode { + statusCodes = [httpStatusCode] + } + let websiteBreakage = WebsiteBreakage(siteUrl: URL(string: test.siteURL)!, category: test.category, - description: "", + description: test.providedDescription, osVersion: test.os ?? "", manufacturer: test.manufacturer ?? "", upgradedHttps: test.wasUpgraded, @@ -91,8 +116,8 @@ final class BrokenSiteReportingTests: XCTestCase { siteType: .mobile, atb: "", model: test.model ?? "", - errors: nil, - httpStatusCodes: nil) + errors: errors, + httpStatusCodes: statusCodes) let reporter = WebsiteBreakageReporter(pixelHandler: { params in @@ -100,7 +125,13 @@ final class BrokenSiteReportingTests: XCTestCase { if let actualValue = params[expectedParam.name], let expectedCleanValue = expectedParam.value.removingPercentEncoding { - if actualValue != expectedCleanValue { + if expectedParam.name == "errorDescriptions" { + // `localizedDescription` includes class information. This format is likely to differ per platform + // anyway. So we'll just check if the value contains the expected data instead + if !actualValue.contains(expectedCleanValue) { + XCTFail("Mismatching param: \(expectedParam.name) => \(expectedCleanValue) does not contain \(actualValue)") + } + } else if actualValue != expectedCleanValue { XCTFail("Mismatching param: \(expectedParam.name) => \(expectedCleanValue) != \(actualValue)") } } else { @@ -133,6 +164,7 @@ private struct Test: Codable { let siteURL: String let wasUpgraded: Bool let category: String + let providedDescription: String? let blockedTrackers, surrogates: [String] let atb, blocklistVersion: String let expectReportURLPrefix: String @@ -141,6 +173,8 @@ private struct Test: Codable { let manufacturer, model, os: String? let gpcEnabled: Bool? let protectionsEnabled: Bool + let errorDescription: String? + let httpStatusCode: Int? } // MARK: - ExpectReportURLParam diff --git a/LocalPackages/DuckUI/Package.swift b/LocalPackages/DuckUI/Package.swift index efd99b6aa4..e00bcb13dd 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", revision: "104ad60a0daa73720c665cbdb9bca894ab6c6af6"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "c92ba4693258d043fe78ef53d1e07a688b0d6fda"), ], targets: [ .target( diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift index 5a3ab5cff1..0478bb7c36 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", revision: "104ad60a0daa73720c665cbdb9bca894ab6c6af6"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "c92ba4693258d043fe78ef53d1e07a688b0d6fda"), .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 770a0aba4a..bc834c4174 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", revision: "104ad60a0daa73720c665cbdb9bca894ab6c6af6"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "c92ba4693258d043fe78ef53d1e07a688b0d6fda"), .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0") ], targets: [ diff --git a/submodules/privacy-reference-tests b/submodules/privacy-reference-tests index 6b7ad1e7f1..237e4f976a 160000 --- a/submodules/privacy-reference-tests +++ b/submodules/privacy-reference-tests @@ -1 +1 @@ -Subproject commit 6b7ad1e7f15270f9dfeb58a272199f4d57c3eb22 +Subproject commit 237e4f976aed8df2efa808dac1d315c4dc5d431a From c2f57cf0cdda8814e935512ba7925b0c8c7dbb52 Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Thu, 22 Feb 2024 09:33:10 -0600 Subject: [PATCH 5/8] Fix tests --- .../BrokenSiteReportingTests.swift | 21 +++++++------------ submodules/privacy-reference-tests | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/DuckDuckGoTests/BrokenSiteReportingTests.swift b/DuckDuckGoTests/BrokenSiteReportingTests.swift index e5871f869a..e449d5fe4b 100644 --- a/DuckDuckGoTests/BrokenSiteReportingTests.swift +++ b/DuckDuckGoTests/BrokenSiteReportingTests.swift @@ -91,12 +91,8 @@ final class BrokenSiteReportingTests: XCTestCase { os_log("Testing [%s]", type: .info, test.name) var errors: [Error]? - var statusCodes: [Int]? - if let error = test.errorDescription { - errors = [MockError(error)] - } - if let httpStatusCode = test.httpStatusCode { - statusCodes = [httpStatusCode] + if let errs = test.errorDescriptions { + errors = errs.map { MockError($0) } } let websiteBreakage = WebsiteBreakage(siteUrl: URL(string: test.siteURL)!, @@ -117,7 +113,7 @@ final class BrokenSiteReportingTests: XCTestCase { atb: "", model: test.model ?? "", errors: errors, - httpStatusCodes: statusCodes) + httpStatusCodes: test.httpErrorCodes ?? []) let reporter = WebsiteBreakageReporter(pixelHandler: { params in @@ -127,10 +123,9 @@ final class BrokenSiteReportingTests: XCTestCase { let expectedCleanValue = expectedParam.value.removingPercentEncoding { if expectedParam.name == "errorDescriptions" { // `localizedDescription` includes class information. This format is likely to differ per platform - // anyway. So we'll just check if the value contains the expected data instead - if !actualValue.contains(expectedCleanValue) { - XCTFail("Mismatching param: \(expectedParam.name) => \(expectedCleanValue) does not contain \(actualValue)") - } + // anyway. So we'll just check if the value contains an array of strings + XCTAssert(actualValue.split(separator: ",").count > 1, + "Param \(expectedParam.name) expected to be an array of strings. Received: \(actualValue)") } else if actualValue != expectedCleanValue { XCTFail("Mismatching param: \(expectedParam.name) => \(expectedCleanValue) != \(actualValue)") } @@ -173,8 +168,8 @@ private struct Test: Codable { let manufacturer, model, os: String? let gpcEnabled: Bool? let protectionsEnabled: Bool - let errorDescription: String? - let httpStatusCode: Int? + let errorDescriptions: [String]? + let httpErrorCodes: [Int]? } // MARK: - ExpectReportURLParam diff --git a/submodules/privacy-reference-tests b/submodules/privacy-reference-tests index 237e4f976a..40ce86837d 160000 --- a/submodules/privacy-reference-tests +++ b/submodules/privacy-reference-tests @@ -1 +1 @@ -Subproject commit 237e4f976aed8df2efa808dac1d315c4dc5d431a +Subproject commit 40ce86837def0adbf558f00ed0531ab4df5839a8 From f9992e82e2834292bd95d90181193348d50ff8a5 Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Thu, 22 Feb 2024 09:35:31 -0600 Subject: [PATCH 6/8] Update BSK --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- LocalPackages/DuckUI/Package.swift | 2 +- LocalPackages/SyncUI/Package.swift | 2 +- LocalPackages/Waitlist/Package.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 6d193fada5..20bb6d416c 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9892,7 +9892,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = revision; - revision = c92ba4693258d043fe78ef53d1e07a688b0d6fda; + revision = aea703f144eca1116a8019fb5bd4f1fcbdb4b45c; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/LocalPackages/DuckUI/Package.swift b/LocalPackages/DuckUI/Package.swift index e00bcb13dd..90494f6517 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", revision: "c92ba4693258d043fe78ef53d1e07a688b0d6fda"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "aea703f144eca1116a8019fb5bd4f1fcbdb4b45c"), ], targets: [ .target( diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift index 0478bb7c36..f421130b03 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", revision: "c92ba4693258d043fe78ef53d1e07a688b0d6fda"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "aea703f144eca1116a8019fb5bd4f1fcbdb4b45c"), .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 bc834c4174..fc226c5096 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", revision: "c92ba4693258d043fe78ef53d1e07a688b0d6fda"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "aea703f144eca1116a8019fb5bd4f1fcbdb4b45c"), .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0") ], targets: [ From a00b493f943753af9b741658a9dc94b842456134 Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Thu, 22 Feb 2024 09:36:01 -0600 Subject: [PATCH 7/8] Packages didn't finish --- .../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 2b13d49752..34dc0a95a1 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,7 +14,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "c92ba4693258d043fe78ef53d1e07a688b0d6fda" + "revision" : "aea703f144eca1116a8019fb5bd4f1fcbdb4b45c" } }, { From 8821a710d37f654eb577d763892d8a63439348ca Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Thu, 22 Feb 2024 12:54:37 -0600 Subject: [PATCH 8/8] Pin BSK version --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 7 ++++--- LocalPackages/DuckUI/Package.swift | 2 +- LocalPackages/SyncUI/Package.swift | 2 +- LocalPackages/Waitlist/Package.swift | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 20bb6d416c..2765bdc815 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9891,8 +9891,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = revision; - revision = aea703f144eca1116a8019fb5bd4f1fcbdb4b45c; + kind = exactVersion; + version = 110.0.0; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 34dc0a95a1..4203deb63c 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,7 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "aea703f144eca1116a8019fb5bd4f1fcbdb4b45c" + "revision" : "d56b90bd229288f681f0a3a6a325ef25e3ce5f3c", + "version" : "110.0.0" } }, { @@ -31,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "revision" : "063b560e59a50e03d9b00b88a7fcb2ed2b562395", - "version" : "4.61.0" + "revision" : "36ddba2cbac52a41b9a9275af06d32fa8a56d2d7", + "version" : "4.64.0" } }, { diff --git a/LocalPackages/DuckUI/Package.swift b/LocalPackages/DuckUI/Package.swift index 90494f6517..fb9d911c3d 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", revision: "aea703f144eca1116a8019fb5bd4f1fcbdb4b45c"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.0"), ], targets: [ .target( diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift index f421130b03..e94aa1baa5 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", revision: "aea703f144eca1116a8019fb5bd4f1fcbdb4b45c"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.0"), .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 fc226c5096..4886b2ffd4 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", revision: "aea703f144eca1116a8019fb5bd4f1fcbdb4b45c"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.0"), .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0") ], targets: [