Rename SyncUI to SyncUI-macOS (#3781)

Task/Issue URL: https://app.asana.com/0/0/1209243550452452/f
Tech Design URL:
CC:

Description:

This PR renames the SyncUI local package to SyncUI-macOS, fixing package resolution issues when combining the macOS and iOS projects into a single workspace.

DuckDuckGo-macOS.xcodeproj/project.pbxproj

@@ -1239,8 +1239,6 @@
 		37AFCE8B27DB69BC00471A10 /* PreferencesGeneralView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE8A27DB69BC00471A10 /* PreferencesGeneralView.swift */; };
 		37AFCE9227DB8CAD00471A10 /* PreferencesAboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE9127DB8CAD00471A10 /* PreferencesAboutView.swift */; };
 		37B11B3928095E6600CBB621 /* TabLazyLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B11B3828095E6600CBB621 /* TabLazyLoader.swift */; };
-		37BA812D29B3CD690053F1A3 /* SyncUI in Frameworks */ = {isa = PBXBuildFile; productRef = 37BA812C29B3CD690053F1A3 /* SyncUI */; };
-		37BA812F29B3CD6E0053F1A3 /* SyncUI in Frameworks */ = {isa = PBXBuildFile; productRef = 37BA812E29B3CD6E0053F1A3 /* SyncUI */; };
 		37BE087A2D09C0F200C77B8E /* NewTabPageNextStepsCardsProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BE08792D09C0EA00C77B8E /* NewTabPageNextStepsCardsProvider.swift */; };
 		37BE087B2D09C0F200C77B8E /* NewTabPageNextStepsCardsProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BE08792D09C0EA00C77B8E /* NewTabPageNextStepsCardsProvider.swift */; };
 		37BF3F14286D8A6500BD9014 /* PinnedTabsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BF3F13286D8A6500BD9014 /* PinnedTabsManager.swift */; };
@@ -1494,6 +1492,8 @@
 		4B9292D52667123700AD2C21 /* BookmarkManagementDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CD2667123700AD2C21 /* BookmarkManagementDetailViewController.swift */; };
 		4B9292D92667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292D82667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift */; };
 		4B9292DB2667125D00AD2C21 /* BookmarksContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292DA2667125D00AD2C21 /* BookmarksContextMenu.swift */; };
+		4B94B7992D4731E80014AAB8 /* SyncUI-macOS in Frameworks */ = {isa = PBXBuildFile; productRef = 4B94B7982D4731E80014AAB8 /* SyncUI-macOS */; };
+		4B94B79B2D4731F00014AAB8 /* SyncUI-macOS in Frameworks */ = {isa = PBXBuildFile; productRef = 4B94B79A2D4731F00014AAB8 /* SyncUI-macOS */; };
 		4B9579212AC687170062CA31 /* HardwareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9579202AC687170062CA31 /* HardwareModel.swift */; };
 		4B9579222AC687170062CA31 /* HardwareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9579202AC687170062CA31 /* HardwareModel.swift */; };
 		4B9754EC2984300100D7B834 /* EmailManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3B848F297A0E1000A384BD /* EmailManagerExtension.swift */; };
@@ -3771,7 +3771,6 @@
 		37AFCE8A27DB69BC00471A10 /* PreferencesGeneralView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesGeneralView.swift; sourceTree = "<group>"; };
 		37AFCE9127DB8CAD00471A10 /* PreferencesAboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesAboutView.swift; sourceTree = "<group>"; };
 		37B11B3828095E6600CBB621 /* TabLazyLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabLazyLoader.swift; sourceTree = "<group>"; };
-		37BA812B29B3CB8A0053F1A3 /* SyncUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = SyncUI; sourceTree = "<group>"; };
 		37BE08792D09C0EA00C77B8E /* NewTabPageNextStepsCardsProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageNextStepsCardsProvider.swift; sourceTree = "<group>"; };
 		37BF3F13286D8A6500BD9014 /* PinnedTabsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinnedTabsManager.swift; sourceTree = "<group>"; };
 		37BF3F1E286F0A7A00BD9014 /* PinnedTabsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PinnedTabsViewModel.swift; sourceTree = "<group>"; };
@@ -3972,6 +3971,7 @@
 		4B9292CD2667123700AD2C21 /* BookmarkManagementDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkManagementDetailViewController.swift; sourceTree = "<group>"; };
 		4B9292D82667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkListTreeControllerDataSource.swift; sourceTree = "<group>"; };
 		4B9292DA2667125D00AD2C21 /* BookmarksContextMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksContextMenu.swift; sourceTree = "<group>"; };
+		4B94B7512D471E7E0014AAB8 /* SyncUI-macOS */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = "SyncUI-macOS"; sourceTree = "<group>"; };
 		4B9579202AC687170062CA31 /* HardwareModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HardwareModel.swift; sourceTree = "<group>"; };
 		4B980E202817604000282EE1 /* NSNotificationName+Debug.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSNotificationName+Debug.swift"; sourceTree = "<group>"; };
 		4B98D27928D95F1A003C2B6F /* ChromiumFaviconsReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChromiumFaviconsReaderTests.swift; sourceTree = "<group>"; };
@@ -5092,13 +5092,13 @@
 				5641734D2CFE169400F4B716 /* PixelExperimentKit in Frameworks */,
 				85E2BBD02B8F534A00DBEC7A /* History in Frameworks */,
 				4BF97AD52B43C43F00EB4240 /* NetworkProtection in Frameworks */,
+				4B94B79B2D4731F00014AAB8 /* SyncUI-macOS in Frameworks */,
 				560EB9372C78974C0080DBC8 /* Onboarding in Frameworks */,
 				3739326529AE4B39009346AE /* DDGSync in Frameworks */,
 				D6BC8AC82C5A95B10025375B /* DuckPlayer in Frameworks */,
 				37DF000729F9C061002B7D3E /* SyncDataProviders in Frameworks */,
 				9D9DE5752C63AA0C00D20B15 /* AppKitExtensions in Frameworks */,
 				371BBC592D00C897008FA0C7 /* NewTabPage in Frameworks */,
-				37BA812F29B3CD6E0053F1A3 /* SyncUI in Frameworks */,
 				3706FCAF293F65D500E42796 /* PrivacyDashboard in Frameworks */,
 				CD34F0C42C8869FF006826BE /* MaliciousSiteProtection in Frameworks */,
 			);
@@ -5364,7 +5364,6 @@
 				85D44B862BA08D29001B4AB5 /* Suggestions in Frameworks */,
 				37DF000529F9C056002B7D3E /* SyncDataProviders in Frameworks */,
 				374EFDEB2D01A1D800B30939 /* Utilities in Frameworks */,
-				37BA812D29B3CD690053F1A3 /* SyncUI in Frameworks */,
 				9D9DE5732C63AA0700D20B15 /* AppKitExtensions in Frameworks */,
 				F1DF95E72BD188B60045E591 /* LoginItems in Frameworks */,
 				CBECDB8A2CDBD616005B8B87 /* PageRefreshMonitor in Frameworks */,
@@ -5373,6 +5372,7 @@
 				CBECDB8C2CDBD61C005B8B87 /* BrokenSitePrompt in Frameworks */,
 				371BBC572D00C891008FA0C7 /* NewTabPage in Frameworks */,
 				98A50964294B691800D10880 /* Persistence in Frameworks */,
+				4B94B7992D4731E80014AAB8 /* SyncUI-macOS in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6022,14 +6022,14 @@
 				7B25FE322AD12C990012AFAB /* NetworkProtectionMac */,
 				374F18B32D006F940032EA4E /* NewTabPage */,
 				378F44E229B4B7B600899924 /* SwiftUIExtensions */,
-				37BA812B29B3CB8A0053F1A3 /* SyncUI */,
 				1E862A882A9FC01200F84D4B /* SubscriptionUI */,
 				7BEC182D2AD5D89C00D30536 /* SystemExtensionManager */,
 				7B8594172B5B25FB0007EB3E /* UDSHelper */,
 				373DE97A2D3916FD000577EE /* UserScriptActionsManager */,
 				3772BEDF2D01A1400019B9EF /* Utilities */,
 				3720B7F82D00DA4500D20F23 /* WebKitExtensions */,
 				7B76E6852AD5D77600186A84 /* XPCHelper */,
+				4B94B7512D471E7E0014AAB8 /* SyncUI-macOS */,
 			);
 			path = LocalPackages;
 			sourceTree = "<group>";
@@ -9998,7 +9998,6 @@
 				37F44A5E298C17830025E7FE /* Navigation */,
 				984FD3BE299ACF35007334DD /* Bookmarks */,
 				3739326429AE4B39009346AE /* DDGSync */,
-				37BA812E29B3CD6E0053F1A3 /* SyncUI */,
 				378F44E529B4BDEE00899924 /* SwiftUIExtensions */,
 				B6EC37FE29B8D915001ACE79 /* Configuration */,
 				37DF000629F9C061002B7D3E /* SyncDataProviders */,
@@ -10036,6 +10035,7 @@
 				374EFDEC2D01A1DE00B30939 /* Utilities */,
 				5641734C2CFE169400F4B716 /* PixelExperimentKit */,
 				379230952D3852860019E130 /* HistoryView */,
+				4B94B79A2D4731F00014AAB8 /* SyncUI-macOS */,
 			);
 			productName = DuckDuckGo;
 			productReference = 3706FD05293F65D500E42796 /* DuckDuckGo App Store.app */;
@@ -10484,7 +10484,6 @@
 				B6B77BE7297973D4001E68A1 /* Navigation */,
 				987799EC299998B1005D8EB6 /* Bookmarks */,
 				3739326629AE4B42009346AE /* DDGSync */,
-				37BA812C29B3CD690053F1A3 /* SyncUI */,
 				378F44E329B4BDE900899924 /* SwiftUIExtensions */,
 				371D00E029D8509400EC8598 /* OpenSSL */,
 				37DF000429F9C056002B7D3E /* SyncDataProviders */,
@@ -10522,6 +10521,7 @@
 				374EFDEA2D01A1D800B30939 /* Utilities */,
 				5641734A2CFE168700F4B716 /* PixelExperimentKit */,
 				379230932D38527E0019E130 /* HistoryView */,
+				4B94B7982D4731E80014AAB8 /* SyncUI-macOS */,
 			);
 			productName = DuckDuckGo;
 			productReference = AA585D7E248FD31100E9A3E2 /* DuckDuckGo.app */;
@@ -15722,14 +15722,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Persistence;
 		};
-		37BA812C29B3CD690053F1A3 /* SyncUI */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = SyncUI;
-		};
-		37BA812E29B3CD6E0053F1A3 /* SyncUI */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = SyncUI;
-		};
 		37DB56EC2C3B314F0093D4DC /* BrowserServicesKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -15824,6 +15816,14 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = "plugin:InputFilesChecker";
 		};
+		4B94B7982D4731E80014AAB8 /* SyncUI-macOS */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = "SyncUI-macOS";
+		};
+		4B94B79A2D4731F00014AAB8 /* SyncUI-macOS */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = "SyncUI-macOS";
+		};
 		4BA7C4DC2B3F64E500AFE511 /* LoginItems */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = LoginItems;

DuckDuckGo/Preferences/Model/SyncPreferences.swift

@@ -21,7 +21,7 @@ import DDGSync
 import Combine
 import Common
 import SystemConfiguration
-import SyncUI
+import SyncUI_macOS
 import SwiftUI
 import PDFKit
 import Navigation
@@ -40,7 +40,7 @@ extension SyncDevice {
     }
 }
 
-final class SyncPreferences: ObservableObject, SyncUI.ManagementViewModel {
+final class SyncPreferences: ObservableObject, SyncUI_macOS.ManagementViewModel {
     var syncPausedTitle: String? {
         return syncPausedStateManager.syncPausedMessageData?.title
     }

DuckDuckGo/Preferences/View/PreferencesRootView.swift

@@ -20,7 +20,7 @@ import Common
 import PreferencesViews
 import SwiftUI
 import SwiftUIExtensions
-import SyncUI
+import SyncUI_macOS
 import BrowserServicesKit
 import PixelKit
 import Subscription

DuckDuckGo/Preferences/View/PreferencesSyncView.swift

@@ -18,7 +18,7 @@
 
 import SwiftUI
 import Common
-import SyncUI
+import SyncUI_macOS
 import SwiftUIExtensions
 import BrowserServicesKit
 import os.log
@@ -33,7 +33,7 @@ struct SyncView: View {
                 syncCredentialsAdapter: syncDataProviders.credentialsAdapter,
                 syncPausedStateManager: syncDataProviders.syncErrorHandler
             )
-            SyncUI.ManagementView(model: syncPreferences)
+            SyncUI_macOS.ManagementView(model: syncPreferences)
                 .onAppear {
                     requestSync()
                 }

DuckDuckGo/Sync/FaviconsFetcherOnboarding.swift

@@ -19,7 +19,7 @@
 import Combine
 import Foundation
 import DDGSync
-import SyncUI
+import SyncUI_macOS
 
 final class FaviconsFetcherOnboarding {
 

DuckDuckGo/Sync/FaviconsFetcherOnboardingViewController.swift

@@ -18,7 +18,7 @@
 
 import AppKit
 import SwiftUI
-import SyncUI
+import SyncUI_macOS
 
 final class FaviconsFetcherOnboardingViewController: NSViewController {
 

DuckDuckGo/Sync/SyncManagementDialogViewController.swift

@@ -18,7 +18,7 @@
 
 import AppKit
 import SwiftUI
-import SyncUI
+import SyncUI_macOS
 
 final class SyncManagementDialogViewController: NSViewController {
 

LocalPackages/SyncUI/Package.swift → LocalPackages/SyncUI-macOS/Package.swift

@@ -4,20 +4,20 @@
 import PackageDescription
 
 let package = Package(
-    name: "SyncUI",
+    name: "SyncUI-macOS",
     defaultLocalization: "en",
     platforms: [ .macOS("11.4") ],
     products: [
         .library(
-            name: "SyncUI",
-            targets: ["SyncUI"]),
+            name: "SyncUI-macOS",
+            targets: ["SyncUI-macOS"]),
     ],
     dependencies: [
         .package(path: "../SwiftUIExtensions"),
     ],
     targets: [
         .target(
-            name: "SyncUI",
+            name: "SyncUI-macOS",
             dependencies: [
                 .product(name: "PreferencesViews", package: "SwiftUIExtensions"),
                 .product(name: "SwiftUIExtensions", package: "SwiftUIExtensions"),
@@ -32,7 +32,7 @@ let package = Package(
         .testTarget(
             name: "SyncUITests",
             dependencies: [
-                "SyncUI",
+                "SyncUI-macOS",
             ]
         ),
     ]

LocalPackages/SyncUI/Tests/SyncUITests/RecoveryCodeViewModelTests.swift → LocalPackages/SyncUI-macOS/Tests/SyncUITests/RecoveryCodeViewModelTests.swift

@@ -17,7 +17,7 @@
 //
 
 import XCTest
-@testable import SyncUI
+@testable import SyncUI_macOS
 
 final class RecoveryCodeViewModelTests: XCTestCase {
 

UnitTests/Sync/SyncPreferencesTests.swift

@@ -19,7 +19,7 @@
 import Bookmarks
 import Combine
 import Persistence
-import SyncUI
+import SyncUI_macOS
 import XCTest
 import PersistenceTestingUtils
 @testable import BrowserServicesKit