Skip to content

Commit 651bf1b

Browse files
intitniintitni
committed
Move Preferences and Configs to Tool
1 parent 0ccd6aa commit 651bf1b

17 files changed

+42
-24
lines changed

‎Core/Package.swift‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ let package = Package(
2626
"SuggestionModel",
2727
"Client",
2828
"XPCShared",
29-
"Preferences",
3029
"Logger",
3130
]
3231
),
@@ -38,7 +37,6 @@ let package = Package(
3837
"GitHubCopilotService",
3938
"Client",
4039
"XPCShared",
41-
"Preferences",
4240
"LaunchAgentManager",
4341
"Logger",
4442
"UpdateChecker",
@@ -65,10 +63,10 @@ let package = Package(
6563
name: "Client",
6664
dependencies: [
6765
"SuggestionModel",
68-
"Preferences",
6966
"XPCShared",
7067
"Logger",
7168
"GitHubCopilotService",
69+
.product(name: "Preferences", package: "Tool"),
7270
]
7371
),
7472
.target(
@@ -78,7 +76,6 @@ let package = Package(
7876
"SuggestionService",
7977
"GitHubCopilotService",
8078
"OpenAIService",
81-
"Preferences",
8279
"XPCShared",
8380
"CGEventObserver",
8481
"DisplayLink",
@@ -92,6 +89,7 @@ let package = Package(
9289
"PromptToCodeService",
9390
"ServiceUpdateMigration",
9491
"UserDefaultsObserver",
92+
.product(name: "Preferences", package: "Tool"),
9593
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
9694
.product(name: "PythonKit", package: "PythonKit"),
9795
]
@@ -103,9 +101,9 @@ let package = Package(
103101
"Client",
104102
"GitHubCopilotService",
105103
"SuggestionInjector",
106-
"Preferences",
107104
"XPCShared",
108105
"Environment",
106+
.product(name: "Preferences", package: "Tool"),
109107
]
110108
),
111109
.target(
@@ -116,19 +114,18 @@ let package = Package(
116114
"SuggestionService",
117115
]
118116
),
119-
.target(name: "Preferences", dependencies: ["Configs"]),
120117

121118
// MARK: - Host App
122119

123120
.target(
124121
name: "HostApp",
125122
dependencies: [
126-
"Preferences",
127123
"Client",
128124
"GitHubCopilotService",
129125
"CodeiumService",
130126
"SuggestionModel",
131127
"LaunchAgentManager",
128+
.product(name: "Preferences", package: "Tool"),
132129
]
133130
),
134131

@@ -182,7 +179,11 @@ let package = Package(
182179
"OpenAIService",
183180
"Environment",
184181
"XcodeInspector",
185-
"Preferences",
182+
183+
// plugins
184+
"MathChatPlugin",
185+
186+
.product(name: "Preferences", package: "Tool"),
186187
]
187188
),
188189
.target(
@@ -199,9 +200,9 @@ let package = Package(
199200
dependencies: [
200201
"OpenAIService",
201202
"Environment",
202-
"Preferences",
203203
"SuggestionModel",
204204
"XcodeInspector",
205+
.product(name: "Preferences", package: "Tool"),
205206
]
206207
),
207208

@@ -226,7 +227,6 @@ let package = Package(
226227

227228
// MARK: - Helpers
228229

229-
.target(name: "Configs"),
230230
.target(name: "CGEventObserver"),
231231
.target(name: "Logger"),
232232
.target(name: "FileChangeChecker"),
@@ -244,7 +244,10 @@ let package = Package(
244244
.target(name: "AXExtension"),
245245
.target(
246246
name: "ServiceUpdateMigration",
247-
dependencies: ["Preferences", "GitHubCopilotService"]
247+
dependencies: [
248+
"GitHubCopilotService",
249+
.product(name: "Preferences", package: "Tool"),
250+
]
248251
),
249252
.target(name: "UserDefaultsObserver"),
250253
.target(
@@ -266,7 +269,7 @@ let package = Package(
266269
"LanguageClient",
267270
"SuggestionModel",
268271
"XPCShared",
269-
"Preferences",
272+
.product(name: "Preferences", package: "Tool"),
270273
.product(name: "Terminal", package: "Tool"),
271274
]
272275
),
@@ -281,8 +284,8 @@ let package = Package(
281284
name: "OpenAIService",
282285
dependencies: [
283286
"Logger",
284-
"Preferences",
285287
"GPTEncoder",
288+
.product(name: "Preferences", package: "Tool"),
286289
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
287290
]
288291
),
@@ -298,12 +301,24 @@ let package = Package(
298301
dependencies: [
299302
"LanguageClient",
300303
"SuggestionModel",
301-
"Preferences",
302304
"KeychainAccess",
305+
.product(name: "Preferences", package: "Tool"),
303306
.product(name: "Terminal", package: "Tool"),
304-
"Configs",
305307
]
306308
),
309+
310+
// MARK: - Chat Plugins
311+
312+
.target(
313+
name: "MathChatPlugin",
314+
dependencies: [
315+
"ChatPlugin",
316+
"OpenAIService",
317+
.product(name: "LangChain", package: "Tool"),
318+
.product(name: "PythonKit", package: "PythonKit"),
319+
],
320+
path: "Sources/ChatPlugins/MathChatPlugin"
321+
),
307322
]
308323
)
309324

‎Tool/Package.swift‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,36 @@ let package = Package(
88
platforms: [.macOS(.v12)],
99
products: [
1010
.library(name: "Terminal", targets: ["Terminal"]),
11-
.library(name: "LangChainService", targets: ["LangChainService"]),
11+
.library(name: "LangChain", targets: ["LangChain"]),
12+
.library(name: "Preferences", targets: ["Preferences", "Configs"]),
1213
],
1314
dependencies: [
1415
.package(url: "https://github.com/pvieito/PythonKit.git", branch: "master"),
1516
],
1617
targets: [
1718
// MARK: - Helpers
1819

19-
.target(
20-
name: "Terminal",
21-
dependencies: []
22-
),
20+
.target(name: "Configs"),
21+
22+
.target(name: "Preferences", dependencies: ["Configs"]),
23+
24+
.target(name: "Terminal"),
2325

2426
// MARK: - Services
2527

2628
.target(
27-
name: "LangChainService",
29+
name: "LangChain",
2830
dependencies: [
29-
.product(name: "PythonKit", package: "PythonKit")
31+
.product(name: "PythonKit", package: "PythonKit"),
3032
]
3133
),
3234

3335
// MARK: - Tests
3436

3537
.testTarget(
36-
name: "LangChainServiceTests",
37-
dependencies: ["LangChainService"]
38+
name: "LangChainTests",
39+
dependencies: ["LangChain"]
3840
),
3941
]
4042
)
43+

Core/Sources/Configs/Configurations.swift renamed to Tool/Sources/Configs/Configurations.swift

File renamed without changes.

Core/Sources/Preferences/AppStorage.swift renamed to Tool/Sources/Preferences/AppStorage.swift

File renamed without changes.

Core/Sources/Preferences/ChatFeatureProvider.swift renamed to Tool/Sources/Preferences/ChatFeatureProvider.swift

File renamed without changes.

Core/Sources/Preferences/ChatGPTModel.swift renamed to Tool/Sources/Preferences/ChatGPTModel.swift

File renamed without changes.

Core/Sources/Preferences/CustomCommand.swift renamed to Tool/Sources/Preferences/CustomCommand.swift

File renamed without changes.

Core/Sources/Preferences/Keys.swift renamed to Tool/Sources/Preferences/Keys.swift

File renamed without changes.

Core/Sources/Preferences/Locale.swift renamed to Tool/Sources/Preferences/Locale.swift

File renamed without changes.

Core/Sources/Preferences/NodeRunner.swift renamed to Tool/Sources/Preferences/NodeRunner.swift

File renamed without changes.

0 commit comments

Comments
 (0)