From 25d029ace122b844058246cf84ef35be0b091cca Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Thu, 21 Dec 2023 13:48:28 -0600 Subject: [PATCH 1/3] Update BSK --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 5 ++--- LocalPackages/Account/Package.swift | 2 +- LocalPackages/DataBrokerProtection/Package.swift | 2 +- LocalPackages/NetworkProtectionMac/Package.swift | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 6f8a942aaf..36a3e64880 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -12975,8 +12975,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 98.0.1; + kind = revision; + revision = 6049341ed442d65cfd1bc3ed4d76790a3dcd8a0a; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 13547f23d7..2cc2014600 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" : "ea133abe237b6cb57a4237e0373318a40c10afc2", - "version" : "98.0.1" + "revision" : "6049341ed442d65cfd1bc3ed4d76790a3dcd8a0a" } }, { @@ -147,7 +146,7 @@ { "identity" : "trackerradarkit", "kind" : "remoteSourceControl", - "location" : "https://github.com/duckduckgo/TrackerRadarKit", + "location" : "https://github.com/duckduckgo/TrackerRadarKit.git", "state" : { "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff", "version" : "1.2.2" diff --git a/LocalPackages/Account/Package.swift b/LocalPackages/Account/Package.swift index 49f48da084..53a54654b4 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: "98.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "6049341ed442d65cfd1bc3ed4d76790a3dcd8a0a"), .package(path: "../Purchase") ], targets: [ diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 435391c9df..2c1ab772fa 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: "98.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "6049341ed442d65cfd1bc3ed4d76790a3dcd8a0a"), .package(path: "../PixelKit"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper") diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index cd031f9386..9bad77f7e0 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -30,7 +30,7 @@ let package = Package( .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "98.0.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "6049341ed442d65cfd1bc3ed4d76790a3dcd8a0a"), .package(path: "../XPCHelper"), .package(path: "../SwiftUIExtensions") ], From 40e08be86cc78c1247d392b675f06be5ee22c8eb Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Fri, 12 Jan 2024 10:22:22 -0600 Subject: [PATCH 2/3] Update BSK --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- LocalPackages/DataBrokerProtection/Package.swift | 2 +- LocalPackages/LoginItems/Package.swift | 2 +- LocalPackages/NetworkProtectionMac/Package.swift | 2 +- LocalPackages/PixelKit/Package.swift | 2 +- LocalPackages/Subscription/Package.swift | 2 +- LocalPackages/SwiftUIExtensions/Package.swift | 2 +- LocalPackages/SyncUI/Package.swift | 2 +- LocalPackages/SystemExtensionManager/Package.swift | 2 +- LocalPackages/XPCHelper/Package.swift | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 920f2bab3c..410a2ba5ca 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -13066,7 +13066,7 @@ repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { kind = revision; - revision = 0c73655b7faf329d8fa2d1b24d43e9144cf8dfab; + revision = 7522aa923521c26b6503db8754829e33c450bc68; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7d43f12ee3..77808f248a 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" : "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab" + "revision" : "7522aa923521c26b6503db8754829e33c450bc68" } }, { diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index df3cdfa965..5b6b5d9369 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", revision: "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"), .package(path: "../PixelKit"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper") diff --git a/LocalPackages/LoginItems/Package.swift b/LocalPackages/LoginItems/Package.swift index fa61aa79ab..0e6d5ff647 100644 --- a/LocalPackages/LoginItems/Package.swift +++ b/LocalPackages/LoginItems/Package.swift @@ -13,7 +13,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"), ], targets: [ .target( diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index 8994abe0c3..39a3638077 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -30,7 +30,7 @@ let package = Package( .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"), .package(path: "../XPCHelper"), .package(path: "../SwiftUIExtensions") ], diff --git a/LocalPackages/PixelKit/Package.swift b/LocalPackages/PixelKit/Package.swift index aed849528b..204a9ef62d 100644 --- a/LocalPackages/PixelKit/Package.swift +++ b/LocalPackages/PixelKit/Package.swift @@ -20,7 +20,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"), ], targets: [ .target( diff --git a/LocalPackages/Subscription/Package.swift b/LocalPackages/Subscription/Package.swift index f4c9876a46..4e5fc0e7c3 100644 --- a/LocalPackages/Subscription/Package.swift +++ b/LocalPackages/Subscription/Package.swift @@ -12,7 +12,7 @@ let package = Package( targets: ["Subscription"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"), ], targets: [ .target( diff --git a/LocalPackages/SwiftUIExtensions/Package.swift b/LocalPackages/SwiftUIExtensions/Package.swift index bb4a5d25f5..6bd632aa84 100644 --- a/LocalPackages/SwiftUIExtensions/Package.swift +++ b/LocalPackages/SwiftUIExtensions/Package.swift @@ -13,7 +13,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"), ], targets: [ .target( diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift index 0efdee724c..d66f20a0e1 100644 --- a/LocalPackages/SyncUI/Package.swift +++ b/LocalPackages/SyncUI/Package.swift @@ -13,7 +13,7 @@ let package = Package( ], dependencies: [ .package(path: "../SwiftUIExtensions"), - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"), ], targets: [ .target( diff --git a/LocalPackages/SystemExtensionManager/Package.swift b/LocalPackages/SystemExtensionManager/Package.swift index b1d8ae5116..0aa511175b 100644 --- a/LocalPackages/SystemExtensionManager/Package.swift +++ b/LocalPackages/SystemExtensionManager/Package.swift @@ -16,7 +16,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"), ], targets: [ // Targets are the basic building blocks of a package, defining a module or a test suite. diff --git a/LocalPackages/XPCHelper/Package.swift b/LocalPackages/XPCHelper/Package.swift index 6090c41bcd..169ce7e0de 100644 --- a/LocalPackages/XPCHelper/Package.swift +++ b/LocalPackages/XPCHelper/Package.swift @@ -30,7 +30,7 @@ let package = Package( .library(name: "XPCHelper", targets: ["XPCHelper"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "0c73655b7faf329d8fa2d1b24d43e9144cf8dfab"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "7522aa923521c26b6503db8754829e33c450bc68"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. From c8e9c8373e929ff65e5e45e29b49fc88ee6f6a24 Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Tue, 16 Jan 2024 08:44:49 -0600 Subject: [PATCH 3/3] Remove dead package dir --- LocalPackages/Account/Package.swift | 36 ----------------------------- 1 file changed, 36 deletions(-) delete mode 100644 LocalPackages/Account/Package.swift diff --git a/LocalPackages/Account/Package.swift b/LocalPackages/Account/Package.swift deleted file mode 100644 index 53a54654b4..0000000000 --- a/LocalPackages/Account/Package.swift +++ /dev/null @@ -1,36 +0,0 @@ -// swift-tools-version: 5.8 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -import PackageDescription - -let package = Package( - name: "Account", - platforms: [ .macOS("11.4") ], - products: [ - .library( - name: "Account", - targets: ["Account"]), - ], - dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "6049341ed442d65cfd1bc3ed4d76790a3dcd8a0a"), - .package(path: "../Purchase") - ], - targets: [ - .target( - name: "Account", - dependencies: [ - .product(name: "BrowserServicesKit", package: "BrowserServicesKit"), - .product(name: "Purchase", package: "Purchase") - ], - swiftSettings: [ - .define("DEBUG", .when(configuration: .debug)) - ], - plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")] - ), - .testTarget( - name: "AccountTests", - dependencies: ["Account"], - plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")] - ), - ] -)