From 6ff71d3efc3f53eb3cf4bb48beffbaab122b1154 Mon Sep 17 00:00:00 2001 From: GioSensation Date: Tue, 10 Oct 2023 15:30:42 +0000 Subject: [PATCH 1/4] Update BSK with autofill 8.4.2 --- DuckDuckGo.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index fd50c1d44d..41488b070b 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -14192,8 +14192,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 80.1.0; + kind = revision; + revision = ffdf1872798f23de073586d4b609b349093a0755; }; }; 4B9579392AC7AE700062CA31 /* XCRemoteSwiftPackageReference "OpenSSL-XCFramework" */ = { @@ -14216,8 +14216,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 81.1.0; + kind = revision; + revision = ffdf1872798f23de073586d4b609b349093a0755; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { From 02a356f5f5ada6b4cf7561b4b1e957a457a2afff Mon Sep 17 00:00:00 2001 From: Graeme Arthur <2030310+graeme@users.noreply.github.com> Date: Wed, 11 Oct 2023 22:32:38 +0200 Subject: [PATCH 2/4] Point to 81.3.0 --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- LocalPackages/DataBrokerProtection/Package.swift | 2 +- LocalPackages/NetworkProtectionMac/Package.swift | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 871f4d5789..9d084c782e 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -14218,8 +14218,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = revision; - revision = ffdf1872798f23de073586d4b609b349093a0755; + kind = exactVersion; + version = 81.3.0; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 368923e240..0bcf307446 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: "81.2.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "81.3.0"), .package(path: "../SwiftUIExtensions") ], targets: [ diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index 8059fa4b00..d336dc698b 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: "81.2.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "81.3.0"), .package(path: "../XPC"), .package(path: "../SwiftUIExtensions") ], From 6c54cee12df1a9071b13c09fe4cde35c5db63e2b Mon Sep 17 00:00:00 2001 From: Graeme Arthur <2030310+graeme@users.noreply.github.com> Date: Wed, 11 Oct 2023 22:34:44 +0200 Subject: [PATCH 3/4] Add forgotten files --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- LocalPackages/Account/Package.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a6343669a0..ecb74df983 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" : "20ef8a4b3791a57d475cd848afdecb85fa010a5e", - "version" : "81.2.0" + "revision" : "7cd525e28fe6d38f5dd4df85658a4ee6c688eebc", + "version" : "81.3.0" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/duckduckgo-autofill.git", "state" : { - "revision" : "55466f10a339843cb79a27af62d5d61c030740b2", - "version" : "8.4.1" + "revision" : "6dd7d696d4e666cedb2f1890a46fe53615226646", + "version" : "8.4.2" } }, { diff --git a/LocalPackages/Account/Package.swift b/LocalPackages/Account/Package.swift index e1f644ef81..bf7a5d84c6 100644 --- a/LocalPackages/Account/Package.swift +++ b/LocalPackages/Account/Package.swift @@ -12,7 +12,7 @@ let package = Package( targets: ["Account"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "81.2.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "81.3.0"), .package(path: "../Purchase") ], targets: [ From b5a23aa7e5a37f4d089a83f0a06319873cf908fd Mon Sep 17 00:00:00 2001 From: Graeme Arthur <2030310+graeme@users.noreply.github.com> Date: Wed, 11 Oct 2023 22:40:11 +0200 Subject: [PATCH 4/4] Fix swiftlint --- LocalPackages/XPC/Sources/XPC/XPCServer.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/LocalPackages/XPC/Sources/XPC/XPCServer.swift b/LocalPackages/XPC/Sources/XPC/XPCServer.swift index 507635a837..a9d728358a 100644 --- a/LocalPackages/XPC/Sources/XPC/XPCServer.swift +++ b/LocalPackages/XPC/Sources/XPC/XPCServer.swift @@ -19,7 +19,6 @@ import Foundation @objc -// swiftlint:disable:next private_over_fileprivate private class XPCConnectionsManager: NSObject, NSXPCListenerDelegate { private let clientInterface: NSXPCInterface