Adjust package location

Author: intitni

Core/Package.swift

@@ -21,15 +21,13 @@ let package = Package(
             name: "Client",
             targets: [
                 "Client",
-                "XPCShared",
             ]
         ),
         .library(
             name: "HostApp",
             targets: [
                 "HostApp",
                 "Client",
-                "XPCShared",
                 "LaunchAgentManager",
                 "UpdateChecker",
             ]
@@ -53,7 +51,7 @@ let package = Package(
         .target(
             name: "Client",
             dependencies: [
-                "XPCShared",
+                .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionService", package: "Tool"),
                 .product(name: "SuggestionModel", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
@@ -63,12 +61,12 @@ let package = Package(
         .target(
             name: "Service",
             dependencies: [
-                "XPCShared",
                 "SuggestionWidget",
                 "ChatService",
                 "PromptToCodeService",
                 "ServiceUpdateMigration",
                 "ChatGPTChatTab",
+                .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionService", package: "Tool"),
                 .product(name: "Workspace", package: "Tool"),
                 .product(name: "UserDefaultsObserver", package: "Tool"),
@@ -92,7 +90,7 @@ let package = Package(
                 "Service",
                 "Client",
                 "SuggestionInjector",
-                "XPCShared",
+                .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionService", package: "Tool"),
                 .product(name: "SuggestionModel", package: "Tool"),
                 .product(name: "Environment", package: "Tool"),
@@ -121,13 +119,6 @@ let package = Package(
             ])
         ),
 
-        // MARK: - XPC Related
-
-        .target(
-            name: "XPCShared",
-            dependencies: [.product(name: "SuggestionModel", package: "Tool")]
-        ),
-
         // MARK: - Suggestion Service
 
         .target(
@@ -380,4 +371,3 @@ let isProIncluded: Bool = {
 
     return isProIncluded()
 }()
-

Pro

@@ -7,6 +7,7 @@ let package = Package(
     name: "Tool",
     platforms: [.macOS(.v12)],
     products: [
+        .library(name: "XPCShared", targets: ["XPCShared"]),
         .library(name: "Terminal", targets: ["Terminal"]),
         .library(name: "LangChain", targets: ["LangChain"]),
         .library(name: "ExternalServices", targets: ["BingSearchService"]),
@@ -68,6 +69,8 @@ let package = Package(
     targets: [
         // MARK: - Helpers
 
+        .target(name: "XPCShared", dependencies: ["SuggestionModel"]),
+        
         .target(name: "Configs"),
 
         .target(name: "Preferences", dependencies: ["Configs", "AIModel"]),
@@ -204,6 +207,7 @@ let package = Package(
             dependencies: [
                 "Workspace",
                 "SuggestionService",
+                "XPCShared",
             ]
         ),
 
@@ -274,6 +278,7 @@ let package = Package(
                 "SuggestionModel",
                 "Preferences",
                 "Terminal",
+                "XcodeInspector",
             ]
         ),
 

Tool/Package.swift

@@ -4,7 +4,6 @@ import LanguageServerProtocol
 import Logger
 import Preferences
 import SuggestionModel
-import XPCShared
 
 public protocol GitHubCopilotAuthServiceType {
     func checkStatus() async throws -> GitHubCopilotAccountStatus