Move Terminal to Tool

Author: intitni

Copilot for Xcode.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -47,6 +47,7 @@ let package = Package(
         ),
     ],
     dependencies: [
+        .package(path: "../Tool"),
         .package(url: "https://github.com/ChimeHQ/LanguageClient", from: "0.3.1"),
         .package(url: "https://github.com/apple/swift-async-algorithms", from: "0.1.0"),
         .package(url: "https://github.com/raspu/Highlightr", from: "2.1.0"),
@@ -184,7 +185,11 @@ let package = Package(
         ),
         .target(
             name: "ChatPlugins",
-            dependencies: ["OpenAIService", "Environment", "Terminal"]
+            dependencies: [
+                "OpenAIService",
+                "Environment",
+                .product(name: "Terminal", package: "Tool"),
+            ]
         ),
         .target(
             name: "ChatContextCollector",
@@ -226,12 +231,11 @@ let package = Package(
         .target(name: "DisplayLink"),
         .target(name: "ActiveApplicationMonitor"),
         .target(name: "AXNotificationStream"),
-        .target(name: "Terminal"),
         .target(
             name: "UpdateChecker",
             dependencies: [
                 "Logger",
-                "Sparkle"
+                "Sparkle",
             ]
         ),
         .target(name: "AXExtension"),
@@ -260,7 +264,7 @@ let package = Package(
                 "SuggestionModel",
                 "XPCShared",
                 "Preferences",
-                "Terminal",
+                .product(name: "Terminal", package: "Tool"),
             ]
         ),
         .testTarget(
@@ -293,7 +297,7 @@ let package = Package(
                 "SuggestionModel",
                 "Preferences",
                 "KeychainAccess",
-                "Terminal",
+                .product(name: "Terminal", package: "Tool"),
                 "Configs",
             ]
         ),

Core/Package.swift

@@ -1,26 +1,30 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "Tool",
+    platforms: [.macOS(.v12)],
     products: [
-        .library(
-            name: "Tool",
-            targets: ["LangChainService"]
-        ),
-    ],
-    dependencies: [
-        .package(url: "https://github.com/pvieito/PythonKit.git", from: "0.3.1"),
+        .library(name: "Terminal", targets: ["Terminal"]),
+        .library(name: "LangChainService", targets: ["LangChainService"]),
     ],
+    dependencies: [],
     targets: [
+        // MARK: - Helpers
+
+        .target(name: "Terminal"),
+
+        // MARK: - Services
+
         .target(
             name: "LangChainService",
-            dependencies: [
-                "PythonKit",
-            ]
+            dependencies: []
         ),
+
+        // MARK: - Tests
+
         .testTarget(
             name: "LangChainServiceTests",
             dependencies: ["LangChainService"]