Merges the latest from main

duckduckgo · diegoreymendez · Feb 3, 2025 · Jan 15, 2025 · Jan 15, 2025 · Jan 23, 2025
commit 60b2d307a0d7ca668dbe10f4bee273de73919243
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -10079,6 +10079,7 @@
 				374EFDEC2D01A1DE00B30939 /* Utilities */,
 				5641734C2CFE169400F4B716 /* PixelExperimentKit */,
 				7BCD16F02D4266F5006B0C67 /* PreferencesUI */,
+				379230952D3852860019E130 /* HistoryView */,
 			);
 			productName = DuckDuckGo;
 			productReference = 3706FD05293F65D500E42796 /* DuckDuckGo App Store.app */;
@@ -10567,6 +10568,7 @@
 				374EFDEA2D01A1D800B30939 /* Utilities */,
 				5641734A2CFE168700F4B716 /* PixelExperimentKit */,
 				7BCD16EE2D4266ED006B0C67 /* PreferencesUI */,
+				379230932D38527E0019E130 /* HistoryView */,
 			);
 			productName = DuckDuckGo;
 			productReference = AA585D7E248FD31100E9A3E2 /* DuckDuckGo.app */;

diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "227.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "229.0.0"),
         .package(path: "../PreferencesUI"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../FeatureFlags")

diff --git a/LocalPackages/UDSHelper/Sources/UDSHelper/UDSServer.swift b/LocalPackages/UDSHelper/Sources/UDSHelper/UDSServer.swift

 /// Convenience Hashable support for `NWConnection`, so we can use `Set<NWConnection>`
 ///
 extension NWConnection: Hashable {
    public static func == (lhs: NWConnection, rhs: NWConnection) -> Bool {
        return lhs === rhs
    }
diff --git a/LocalPackages/AppKitExtensions/Sources/AppKitExtensions/NSEventExtension.swift b/LocalPackages/AppKitExtensions/Sources/AppKitExtensions/NSEventExtension.swift
    }
 }

 extension NSEvent.KeyEquivalent: ExpressibleByStringLiteral, ExpressibleByUnicodeScalarLiteral, ExpressibleByExtendedGraphemeClusterLiteral {
    public typealias StringLiteralType = String

    public static let backspace: Self = [.backspace]
diff --git a/...ges/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/TCPFlowManager.swift b/...ges/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/TCPFlowManager.swift
 //

 import Foundation
 import NetworkExtension
 import os.log

 /// A private global actor to handle UDP flows management
            Task { @TCPFlowActor in
                remoteConnection.receive(minimumIncompleteLength: 1,
                                         maximumLength: Self.maxReceiveSize) { [weak flow] (data, _, isComplete, error) in
                    guard let flow else {
                        continuation.resume(throwing: RemoteConnectionError.cancelled)
                        return
                    }
diff --git a/...ges/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/UDPFlowManager.swift b/...ges/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/UDPFlowManager.swift
 extension UDPConnectionManager: Hashable, Equatable {
    // MARK: - Equatable

    static func == (lhs: UDPConnectionManager, rhs: UDPConnectionManager) -> Bool {
        lhs.endpoint == rhs.endpoint
    }

    // MARK: - Hashable

    func hash(into hasher: inout Hasher) {
        hasher.combine(endpoint)
    }
 }
 }

 extension UDPFlowManager: Hashable {
    static func == (lhs: UDPFlowManager, rhs: UDPFlowManager) -> Bool {
        lhs === rhs
    }

    func hash(into hasher: inout Hasher) {
        hasher.combine(flow)
    }
 }
diff --git a/LocalPackages/PreferencesUI/Sources/PreferencesUI/PreferencesViews.swift b/LocalPackages/PreferencesUI/Sources/PreferencesUI/PreferencesViews.swift
 //

 import SwiftUI
 import SwiftUIExtensions

 public struct TextMenuTitle: View {
    public let text: String
diff --git a/LocalPackages/PreferencesUI/Sources/PreferencesUI/SubfeatureGroup.swift b/LocalPackages/PreferencesUI/Sources/PreferencesUI/SubfeatureGroup.swift
 //
 //  SubfeatureView.swift
 //
 //  Copyright © 2024 DuckDuckGo. All rights reserved.
diff --git a/DuckDuckGo/Preferences/View/PreferencesVPNView.swift b/DuckDuckGo/Preferences/View/PreferencesVPNView.swift
 import SwiftUIExtensions
 import NetworkProtection
 import PixelKit
 import PreferencesUI

 extension Preferences {

diff --git a/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift b/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift
        }
    }


    var appExclusionsFeatureEnabled: Bool {
        featureFlagger.isFeatureOn(.networkProtectionAppExclusions)
    }

	/// Convenience Hashable support for `NWConnection`, so we can use `Set<NWConnection>`
	///
	extension NWConnection: Hashable {
Check warning on line 25 in LocalPackages/UDSHelper/Sources/UDSHelper/UDSServer.swift GitHub Actions / Test (Sandbox) `extension declares a conformance of imported type 'NWConnection' to imported protocols 'Hashable', 'Equatable'; this will not behave correctly if the owners of 'Network' introduce this conformance in the future` Check warning on line 25 in LocalPackages/UDSHelper/Sources/UDSHelper/UDSServer.swift GitHub Actions / Test (Sandbox) `extension declares a conformance of imported type 'NWConnection' to imported protocols 'Hashable', 'Equatable'; this will not behave correctly if the owners of 'Network' introduce this conformance in the future` Check warning on line 25 in LocalPackages/UDSHelper/Sources/UDSHelper/UDSServer.swift GitHub Actions / Test (Non-Sandbox) `extension declares a conformance of imported type 'NWConnection' to imported protocols 'Hashable', 'Equatable'; this will not behave correctly if the owners of 'Network' introduce this conformance in the future` Check warning on line 25 in LocalPackages/UDSHelper/Sources/UDSHelper/UDSServer.swift GitHub Actions / Make Release Build `extension declares a conformance of imported type 'NWConnection' to imported protocols 'Hashable', 'Equatable'; this will not behave correctly if the owners of 'Network' introduce this conformance in the future` Check warning on line 25 in LocalPackages/UDSHelper/Sources/UDSHelper/UDSServer.swift GitHub Actions / Make Release Build `extension declares a conformance of imported type 'NWConnection' to imported protocols 'Hashable', 'Equatable'; this will not behave correctly if the owners of 'Network' introduce this conformance in the future`
	public static func == (lhs: NWConnection, rhs: NWConnection) -> Bool {
	return lhs === rhs
	}
	}
	}

	extension NSEvent.KeyEquivalent: ExpressibleByStringLiteral, ExpressibleByUnicodeScalarLiteral, ExpressibleByExtendedGraphemeClusterLiteral {
Check warning on line 118 in LocalPackages/AppKitExtensions/Sources/AppKitExtensions/NSEventExtension.swift GitHub Actions / Test (Sandbox) `extension declares a conformance of imported type 'Set' to imported protocols 'ExpressibleByStringLiteral', 'ExpressibleByExtendedGraphemeClusterLiteral', 'ExpressibleByUnicodeScalarLiteral'; this will not behave correctly if the owners of 'Swift' introduce this conformance in the future` Check warning on line 118 in LocalPackages/AppKitExtensions/Sources/AppKitExtensions/NSEventExtension.swift GitHub Actions / Test (Sandbox) `extension declares a conformance of imported type 'Set' to imported protocols 'ExpressibleByStringLiteral', 'ExpressibleByExtendedGraphemeClusterLiteral', 'ExpressibleByUnicodeScalarLiteral'; this will not behave correctly if the owners of 'Swift' introduce this conformance in the future`
	public typealias StringLiteralType = String

	public static let backspace: Self = [.backspace]
	//

	import Foundation
	import NetworkExtension
Check warning on line 20 in LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/TCPFlowManager.swift GitHub Actions / Test (Sandbox) `add '@preconcurrency' to suppress 'Sendable'-related warnings from module 'NetworkExtension'`
	import os.log

	/// A private global actor to handle UDP flows management
	Task { @TCPFlowActor in
	remoteConnection.receive(minimumIncompleteLength: 1,
	maximumLength: Self.maxReceiveSize) { [weak flow] (data, _, isComplete, error) in
	guard let flow else {
Check warning on line 194 in LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/TCPFlowManager.swift GitHub Actions / Test (Sandbox) capture of 'flow' with non-sendable type 'NEAppProxyTCPFlow?' in a `@Sendable` closure
	continuation.resume(throwing: RemoteConnectionError.cancelled)
	return
	}
	extension UDPConnectionManager: Hashable, Equatable {
	// MARK: - Equatable

	static func == (lhs: UDPConnectionManager, rhs: UDPConnectionManager) -> Bool {
Check warning on line 173 in LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/UDPFlowManager.swift GitHub Actions / Test (Sandbox) `global actor 'UDPFlowActor'-isolated operator function '==' cannot be used to satisfy nonisolated protocol requirement; this is an error in the Swift 6 language mode`
	lhs.endpoint == rhs.endpoint
	}

	// MARK: - Hashable

	func hash(into hasher: inout Hasher) {
Check warning on line 179 in LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/UDPFlowManager.swift GitHub Actions / Test (Sandbox) `global actor 'UDPFlowActor'-isolated instance method 'hash(into:)' cannot be used to satisfy nonisolated protocol requirement; this is an error in the Swift 6 language mode`
	hasher.combine(endpoint)
	}
	}
	}

	extension UDPFlowManager: Hashable {
	static func == (lhs: UDPFlowManager, rhs: UDPFlowManager) -> Bool {
Check warning on line 322 in LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/UDPFlowManager.swift GitHub Actions / Test (Sandbox) `global actor 'UDPFlowActor'-isolated operator function '==' cannot be used to satisfy nonisolated protocol requirement; this is an error in the Swift 6 language mode`
	lhs === rhs
	}

	func hash(into hasher: inout Hasher) {
Check warning on line 326 in LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/FlowManagers/UDPFlowManager.swift GitHub Actions / Test (Sandbox) `global actor 'UDPFlowActor'-isolated instance method 'hash(into:)' cannot be used to satisfy nonisolated protocol requirement; this is an error in the Swift 6 language mode`
	hasher.combine(flow)
	}
	}
	//

	import SwiftUI
	import SwiftUIExtensions
Check failure on line 20 in LocalPackages/PreferencesUI/Sources/PreferencesUI/PreferencesViews.swift GitHub Actions / Test (Non-Sandbox) `no such module 'SwiftUIExtensions'` Check failure on line 20 in LocalPackages/PreferencesUI/Sources/PreferencesUI/PreferencesViews.swift GitHub Actions / Make Release Build `no such module 'SwiftUIExtensions'`

	public struct TextMenuTitle: View {
	public let text: String
	//
Check failure on line 1 in LocalPackages/PreferencesUI/Sources/PreferencesUI/SubfeatureGroup.swift GitHub Actions / SwiftLint `Header comments should be consistent with project patterns (file_header)`
	// SubfeatureView.swift
	//
	// Copyright © 2024 DuckDuckGo. All rights reserved.
	import SwiftUIExtensions
	import NetworkProtection
	import PixelKit
	import PreferencesUI
Check failure on line 24 in DuckDuckGo/Preferences/View/PreferencesVPNView.swift GitHub Actions / SwiftLint `Imports should be unique (duplicate_imports)`

	extension Preferences {
	}
	}


Check failure on line 77 in DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift GitHub Actions / SwiftLint `Limit vertical whitespace to a single empty line; currently 2 (vertical_whitespace)`
	var appExclusionsFeatureEnabled: Bool {
	featureFlagger.isFeatureOn(.networkProtectionAppExclusions)
	}