Updates BSK (#2448)

Task/Issue URL: https://app.asana.com/0/1203137811378537/1206513608690551/f Tech Design URL: CC: BSK PR: duckduckgo/BrowserServicesKit#655 macOS PR: duckduckgo/macos-browser#2174 ## Description Just integrating the latest macOS BSK changes. There should literally be no changes for iOS, but please double check.
duckduckgo · Feb 15, 2024 · d9a3568 · d9a3568
1 parent 1f2ff2e
commit d9a3568
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9892,7 +9892,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 107.0.0;
+				version = 107.0.1;
 			};
 		};
 		C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {

diff --git 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" : "328ce451fd1593809d1470ab5a0b5242a595f88c",
-        "version" : "107.0.0"
+        "revision" : "93a9a4153429de38c8b9f186617ff34db84f9250",
+        "version" : "107.0.1"
       }
     },
     {

diff --git a/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift b/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
@@ -22,24 +22,34 @@
 import NetworkProtection
 import UIKit
 import Common
+import NetworkExtension
+
+private class DefaultTunnelSessionProvider: TunnelSessionProvider {
+    func activeSession() async -> NETunnelProviderSession? {
+        try? await ConnectionSessionUtilities.activeSession()
+    }
+}
 
 extension ConnectionStatusObserverThroughSession {
     convenience init() {
-        self.init(platformNotificationCenter: .default,
+        self.init(tunnelSessionProvider: DefaultTunnelSessionProvider(),
+                  platformNotificationCenter: .default,
                   platformDidWakeNotification: UIApplication.didBecomeActiveNotification)
     }
 }
 
 extension ConnectionErrorObserverThroughSession {
     convenience init() {
-        self.init(platformNotificationCenter: .default,
+        self.init(tunnelSessionProvider: DefaultTunnelSessionProvider(),
+                  platformNotificationCenter: .default,
                   platformDidWakeNotification: UIApplication.didBecomeActiveNotification)
     }
 }
 
 extension ConnectionServerInfoObserverThroughSession {
     convenience init() {
-        self.init(platformNotificationCenter: .default,
+        self.init(tunnelSessionProvider: DefaultTunnelSessionProvider(),
+                  platformNotificationCenter: .default,
                   platformDidWakeNotification: UIApplication.didBecomeActiveNotification)
     }
 }

diff --git 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.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "107.0.1"),
     ],
     targets: [
         .target(

diff --git 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.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "107.0.1"),
         .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
     ],
     targets: [

diff --git 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.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "107.0.1"),
         .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
     ],
     targets: [