Break the Subscription module’s dependency on BSK (#2721)

Task/Issue URL: https://app.asana.com/0/1199230911884351/1207201481522088/f Tech Design URL: CC: Description: Client PR for duckduckgo/BrowserServicesKit#802.
duckduckgo · May 1, 2024 · 401b0e9 · 401b0e9
1 parent 71e3c0c
commit 401b0e9
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 9 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -12738,7 +12738,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 142.0.0;
+				version = 143.0.0;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "2681b5271a4e0582f175771737617adb8a4d6e78",
-        "version" : "142.0.0"
+        "revision" : "7c41d69a93bbe80639fb7489e2018e5957ac2b5c",
+        "version" : "143.0.0"
       }
     },
     {

diff --git a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
@@ -22,6 +22,7 @@ import Combine
 import Common
 import Suggestions
 import Subscription
+import BrowserServicesKit
 
 final class AddressBarTextField: NSTextField {
 

diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -21,7 +21,6 @@ import Combine
 import Common
 import BrowserServicesKit
 import PixelKit
-
 import NetworkProtection
 import Subscription
 

diff --git a/...tworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift b/...tworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
@@ -21,6 +21,7 @@ import NetworkProtection
 import NetworkProtectionIPC
 import Common
 import Subscription
+import BrowserServicesKit
 
 extension NetworkProtectionDeviceManager {
 

diff --git a/DuckDuckGo/Preferences/Model/PreferencesSection.swift b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
@@ -19,6 +19,7 @@
 import Foundation
 import SwiftUI
 import Subscription
+import BrowserServicesKit
 
 struct PreferencesSection: Hashable, Identifiable {
     let id: PreferencesSectionIdentifier

diff --git a/DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift b/DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import Subscription
+import BrowserServicesKit
 
 extension DefaultSubscriptionFeatureAvailability {
     convenience init() {

diff --git a/DuckDuckGo/Tab/Navigation/RedirectNavigationResponder.swift b/DuckDuckGo/Tab/Navigation/RedirectNavigationResponder.swift
@@ -19,6 +19,7 @@
 import Navigation
 import Foundation
 import Subscription
+import BrowserServicesKit
 
 struct RedirectNavigationResponder: NavigationResponder {
 

diff --git a/DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift b/DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift
@@ -18,7 +18,7 @@
 
 import AppKit
 import Foundation
-import Subscription
+import BrowserServicesKit
 import PixelKit
 
 final class WaitlistThankYouPromptPresenter {

diff --git a/DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift b/DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift
@@ -18,7 +18,7 @@
 
 import Foundation
 import UserNotifications
-import Subscription
+import BrowserServicesKit
 
 protocol WaitlistViewControllerPresenter {
     static func show(completion: (() -> Void)?)

diff --git 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: "142.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "143.0.0"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
     ],

diff --git 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: "142.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "143.0.0"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.1"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),

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