CodegenKitをアップデートする

.github/workflows/test.yml

@@ -10,10 +10,8 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: swift-actions/setup-swift@v2
-        with:
-          swift-version: "5.10.1"
       - uses: actions/checkout@v4
-      - run: swift package resolve
-      - run: swift build
+      - uses: vapor/swiftly-action@v0.2
+        with:
+          toolchain: "6.3"
       - run: swift test

.gitignore

@@ -6,3 +6,4 @@ xcuserdata/
 DerivedData/
 .swiftpm
 .netrc
+.vscode

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 6.0
 
 import PackageDescription
 
@@ -9,7 +9,7 @@ let package = Package(
         .library(name: "TypeScriptAST", targets: ["TypeScriptAST"])
     ],
     dependencies: [
-        .package(url: "https://github.com/omochi/CodegenKit.git", from: "2.0.0")
+        .package(url: "https://github.com/omochi/CodegenKit.git", from: "2.1.1")
     ],
     targets: [
         .executableTarget(

Plugins/CodegenPlugin/CodegenPlugin.swift

@@ -6,11 +6,11 @@ struct CodegenPlugin: CommandPlugin {
     func performCommand(context: PluginContext, arguments: [String]) async throws {
         let codegen = try context.tool(named: "codegen")
 
-        let sourcesDir = context.package.directory.appending(subpath: "Sources")
+        let sourcesDir = context.package.directoryURL.appending(path: "Sources")
 
         let process = EasyProcess(
-            path: URL(fileURLWithPath: codegen.path.string),
-            args: [sourcesDir.string]
+            path: codegen.url,
+            args: [sourcesDir.path(percentEncoded: false)]
         )
         try process.run()
     }

Plugins/CodegenPlugin/EasyProcess.swift

@@ -4,8 +4,8 @@ struct EasyProcess {
     init(
         path: URL,
         args: [String],
-        outSink: ((Data) -> Void)? = nil,
-        errorSink: ((Data) -> Void)? = nil
+        outSink: (@Sendable (Data) -> Void)? = nil,
+        errorSink: (@Sendable (Data) -> Void)? = nil
     ) {
         self.path = path
         self.args = args
@@ -15,20 +15,20 @@ struct EasyProcess {
 
     var path: URL
     var args: [String]
-    var outSink: (Data) -> Void
-    var errorSink: (Data) -> Void
+    var outSink: @Sendable (Data) -> Void
+    var errorSink: @Sendable (Data) -> Void
 
-    static func makeFileHandleSink(fileHandle: FileHandle) -> (Data) -> Void {
+    static func makeFileHandleSink(fileHandle: FileHandle) -> @Sendable (Data) -> Void {
         return { (data) in
             try? fileHandle.write(contentsOf: data)
         }
     }
 
-    static var defaultOutSink: (Data) -> Void {
+    static var defaultOutSink: @Sendable (Data) -> Void {
         makeFileHandleSink(fileHandle: .standardOutput)
     }
 
-    static var defaultErrorSink: (Data) -> Void {
+    static var defaultErrorSink: @Sendable (Data) -> Void {
         makeFileHandleSink(fileHandle: .standardError)
     }
 
@@ -43,7 +43,7 @@ struct EasyProcess {
         let outPipe = Pipe()
         p.standardOutput = outPipe
 
-        outPipe.fileHandleForReading.readabilityHandler = { (h) in
+        outPipe.fileHandleForReading.readabilityHandler = { [outSink] (h) in
             queue.sync {
                 let data = h.availableData
                 if !data.isEmpty {
@@ -55,7 +55,7 @@ struct EasyProcess {
         let errPipe = Pipe()
         p.standardError = errPipe
 
-        errPipe.fileHandleForReading.readabilityHandler = { (h) in
+        errPipe.fileHandleForReading.readabilityHandler = { [errorSink] (h) in
             queue.sync {
                 let data = h.availableData
                 if !data.isEmpty {

Tests/TypeScriptASTTests/TestCaseBase.swift

@@ -5,7 +5,7 @@ class TestCaseBase: XCTestCase {
     func assertPrint(
         _ node: any ASTNode,
         _ expected: String,
-        file: StaticString = #file,
+        file: StaticString = #filePath,
         line: UInt = #line
     ) {
         XCTAssertEqual(node.print(), expected, file: file, line: line)