From b03077813279b06b21c90b5f895933ef6b981277 Mon Sep 17 00:00:00 2001 From: Brad Slayter Date: Thu, 14 Mar 2024 08:27:42 -0500 Subject: [PATCH] Update main and BSK --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 5 ++--- .../Tracker Icons/xaxis.imageset/Contents.json | 12 ++++++++++++ .../Images/Tracker Icons/xaxis.imageset/Xaxis.svg | 4 ++++ DuckDuckGo/Tab/Model/Tab.swift | 2 +- LocalPackages/DataBrokerProtection/Package.swift | 2 +- LocalPackages/NetworkProtectionMac/Package.swift | 2 +- LocalPackages/SubscriptionUI/Package.swift | 2 +- 8 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 DuckDuckGo/Assets.xcassets/Images/Tracker Icons/xaxis.imageset/Contents.json create mode 100644 DuckDuckGo/Assets.xcassets/Images/Tracker Icons/xaxis.imageset/Xaxis.svg diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 90fc764ac7..5f6b20f8a1 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -13748,8 +13748,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 122.2.1; + kind = revision; + revision = a8d76cd3f1352fd9a4f7125fbad3531dce11110b; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index ff344fde70..8ea9c60dcc 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "1295a22823157c9b7d11793299cd58b189e87629", - "version" : "122.2.1" + "revision" : "a8d76cd3f1352fd9a4f7125fbad3531dce11110b" } }, { @@ -165,7 +164,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/DuckDuckGo/Assets.xcassets/Images/Tracker Icons/xaxis.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Tracker Icons/xaxis.imageset/Contents.json new file mode 100644 index 0000000000..0cb9bd811a --- /dev/null +++ b/DuckDuckGo/Assets.xcassets/Images/Tracker Icons/xaxis.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Xaxis.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DuckDuckGo/Assets.xcassets/Images/Tracker Icons/xaxis.imageset/Xaxis.svg b/DuckDuckGo/Assets.xcassets/Images/Tracker Icons/xaxis.imageset/Xaxis.svg new file mode 100644 index 0000000000..605718beb7 --- /dev/null +++ b/DuckDuckGo/Assets.xcassets/Images/Tracker Icons/xaxis.imageset/Xaxis.svg @@ -0,0 +1,4 @@ + + + + diff --git a/DuckDuckGo/Tab/Model/Tab.swift b/DuckDuckGo/Tab/Model/Tab.swift index 5988f38372..8ce6b73193 100644 --- a/DuckDuckGo/Tab/Model/Tab.swift +++ b/DuckDuckGo/Tab/Model/Tab.swift @@ -780,7 +780,7 @@ protocol NewWindowPolicyDecisionMaker { @Published private(set) var lastWebError: Error? @Published private(set) var lastHttpStatusCode: Int? - @Published private(set) var inferredOpenerContext: WebsiteBreakage.OpenerContext? + @Published private(set) var inferredOpenerContext: BrokenSiteReport.OpenerContext? @Published private(set) var refreshCountSinceLoad: Int = 0 @Published private(set) var isLoading: Bool = false diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 16230a9a8e..f2ecc946ce 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: "122.2.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "a8d76cd3f1352fd9a4f7125fbad3531dce11110b"), .package(path: "../PixelKit"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper"), diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index edd448f1f8..d9d9d2155f 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: "122.2.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "a8d76cd3f1352fd9a4f7125fbad3531dce11110b"), .package(path: "../XPCHelper"), .package(path: "../SwiftUIExtensions"), .package(path: "../LoginItems"), diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift index e3f0621d70..d8c08d30ab 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: "122.2.1"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", revision: "a8d76cd3f1352fd9a4f7125fbad3531dce11110b"), .package(path: "../SwiftUIExtensions") ], targets: [