Skip to content

Commit 80ae29d

Browse files
committed
Support the Xcode 26 toolchain
TCA 1.16.1 does not compile under Swift 6.3, so moving to the new toolchain forces a matching dependency bump. - Upgrade swift-composable-architecture from 1.16.1 to 1.26.2 and adopt the new Shared(value:) signature - Align the Tool and ChatPlugins package platforms to macOS 13, so they match every target in the project - Declare the missing CommandHandler dependency in SuggestionWidget, which was breaking the test bundle link step - Drop stale entries from Package.resolved Claude-Session: https://claude.ai/code/session_01QrUJLx9ppwpa2DFUoSGUYo
1 parent a98f1f2 commit 80ae29d

6 files changed

Lines changed: 25 additions & 114 deletions

File tree

‎ChatPlugins/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55

66
let package = Package(
77
name: "ChatPlugins",
8-
platforms: [.macOS(.v12)],
8+
platforms: [.macOS(.v13)],
99
products: [
1010
.library(
1111
name: "ChatPlugins",

‎Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 16 additions & 106 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Core/Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ let package = Package(
4646
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.0.0"),
4747
.package(
4848
url: "https://github.com/pointfreeco/swift-composable-architecture",
49-
exact: "1.16.1"
49+
exact: "1.26.2"
5050
),
5151
// quick hack to support custom UserDefaults
5252
// https://github.com/sindresorhus/KeyboardShortcuts
@@ -233,6 +233,7 @@ let package = Package(
233233
.product(name: "Logger", package: "Tool"),
234234
.product(name: "CustomAsyncAlgorithms", package: "Tool"),
235235
.product(name: "CodeDiff", package: "Tool"),
236+
.product(name: "CommandHandler", package: "Tool"),
236237
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
237238
.product(name: "MarkdownUI", package: "swift-markdown-ui"),
238239
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),

‎Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ extension WindowBaseCommandHandler {
471471

472472
_ = await MainActor.run {
473473
store.send(.promptToCodeGroup(.activateOrCreatePromptToCode(.init(
474-
promptToCodeState: Shared(.init(
474+
promptToCodeState: Shared(value: .init(
475475
source: .init(
476476
language: codeLanguage,
477477
documentURL: fileURL,

‎Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanelView.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ extension PromptToCodePanelView {
10821082

10831083
#Preview("Multiple Snippets") {
10841084
PromptToCodePanelView(store: .init(initialState: .init(
1085-
promptToCodeState: Shared(ModificationState(
1085+
promptToCodeState: Shared(value: ModificationState(
10861086
source: .init(
10871087
language: CodeLanguage.builtIn(.swift),
10881088
documentURL: URL(
@@ -1164,7 +1164,7 @@ extension PromptToCodePanelView {
11641164

11651165
#Preview("Detached With Long File Name") {
11661166
PromptToCodePanelView(store: .init(initialState: .init(
1167-
promptToCodeState: Shared(ModificationState(
1167+
promptToCodeState: Shared(value: ModificationState(
11681168
source: .init(
11691169
language: CodeLanguage.builtIn(.swift),
11701170
documentURL: URL(
@@ -1219,7 +1219,7 @@ extension PromptToCodePanelView {
12191219

12201220
#Preview("Generating") {
12211221
PromptToCodePanelView(store: .init(initialState: .init(
1222-
promptToCodeState: Shared(ModificationState(
1222+
promptToCodeState: Shared(value: ModificationState(
12231223
source: .init(
12241224
language: CodeLanguage.builtIn(.swift),
12251225
documentURL: URL(

‎Tool/Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55

66
let package = Package(
77
name: "Tool",
8-
platforms: [.macOS(.v12)],
8+
platforms: [.macOS(.v13)],
99
products: [
1010
.library(name: "XPCShared", targets: ["XPCShared"]),
1111
.library(name: "Terminal", targets: ["Terminal"]),
@@ -73,7 +73,7 @@ let package = Package(
7373
.package(url: "https://github.com/intitni/Highlightr", branch: "master"),
7474
.package(
7575
url: "https://github.com/pointfreeco/swift-composable-architecture",
76-
exact: "1.16.1"
76+
exact: "1.26.2"
7777
),
7878
.package(url: "https://github.com/apple/swift-syntax.git", from: "600.0.0"),
7979
.package(url: "https://github.com/GottaGetSwifty/CodableWrappers", from: "2.0.7"),

0 commit comments

Comments
 (0)