From 3437b8dfbc004e4174d739e7b7c48b5052455557 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Wed, 1 May 2024 16:05:56 -0700 Subject: [PATCH] =?UTF-8?q?Break=20the=20Subscription=20module=E2=80=99s?= =?UTF-8?q?=20dependency=20on=20BSK=20(#2804)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task/Issue URL: https://app.asana.com/0/414235014887631/1207201481522088/f Tech Design URL: CC: Description: Client PR for duckduckgo/BrowserServicesKit#802. --- DuckDuckGo.xcodeproj/project.pbxproj | 12 ++++++++++-- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- DuckDuckGo/NetworkProtectionStatusViewModel.swift | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 2fbe3d5fde..123d3bafb1 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -201,6 +201,7 @@ 4B274F602AFEAECC003F0745 /* NetworkProtectionWidgetRefreshModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B274F5F2AFEAECC003F0745 /* NetworkProtectionWidgetRefreshModel.swift */; }; 4B37E0502B928CA6009E81CA /* vpn-light-mode.json in Resources */ = {isa = PBXBuildFile; fileRef = 4B37E04F2B928CA6009E81CA /* vpn-light-mode.json */; }; 4B412ACC2BBB3D0900A39F5E /* LazyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B412ACB2BBB3D0900A39F5E /* LazyView.swift */; }; + 4B45D85C2BE0B115006061B5 /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 4B45D85B2BE0B115006061B5 /* Subscription */; }; 4B470EE4299C6DFB0086EBDC /* Core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F143C2E41E4A4CD400CFDE3A /* Core.framework */; }; 4B52648B25F9613B00CB4C24 /* trackerData.json in Resources */ = {isa = PBXBuildFile; fileRef = 4B52648A25F9613B00CB4C24 /* trackerData.json */; }; 4B53648A26718D0E001AA041 /* EmailWaitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B53648926718D0E001AA041 /* EmailWaitlist.swift */; }; @@ -2599,6 +2600,7 @@ buildActionMask = 2147483647; files = ( 02025664298818B200E694E7 /* NetworkExtension.framework in Frameworks */, + 4B45D85C2BE0B115006061B5 /* Subscription in Frameworks */, 4B470EE4299C6DFB0086EBDC /* Core.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5395,6 +5397,7 @@ ); name = PacketTunnelProvider; packageProductDependencies = ( + 4B45D85B2BE0B115006061B5 /* Subscription */, ); productName = PacketTunnelProvider; productReference = 02025662298818B100E694E7 /* PacketTunnelProvider.appex */; @@ -9710,8 +9713,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - branch = 142.0.0; - kind = branch; + kind = exactVersion; + version = 143.0.0; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { @@ -9832,6 +9835,11 @@ package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; productName = SyncDataProviders; }; + 4B45D85B2BE0B115006061B5 /* Subscription */ = { + isa = XCSwiftPackageProductDependency; + package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = Subscription; + }; 4B948E2529DCCDB9002531FA /* Persistence */ = { isa = XCSwiftPackageProductDependency; package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 93ae75a94b..91c730f4fa 100644 --- 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" : { - "branch" : "142.0.0", - "revision" : "2681b5271a4e0582f175771737617adb8a4d6e78" + "revision" : "7c41d69a93bbe80639fb7489e2018e5957ac2b5c", + "version" : "143.0.0" } }, { diff --git a/DuckDuckGo/NetworkProtectionStatusViewModel.swift b/DuckDuckGo/NetworkProtectionStatusViewModel.swift index f2bf5e397a..904eb97fc0 100644 --- a/DuckDuckGo/NetworkProtectionStatusViewModel.swift +++ b/DuckDuckGo/NetworkProtectionStatusViewModel.swift @@ -25,6 +25,7 @@ import Foundation import Combine import NetworkProtection import WidgetKit +import BrowserServicesKit struct NetworkProtectionLocationStatusModel { enum LocationIcon {