Merge pull request #6 from giginet/add-swift6-stack

Add Swift 6 build environment for GitHub Action
giginet · Jul 6, 2024 · bede921 · bede921
2 parents b37aa9c + d690197
commit bede921
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
   Tests:
     strategy:
       matrix:
-        xcode_version: ["15.3"]
+        xcode_version: ["15.4", "16.0"]
     env: 
       DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer"
     runs-on: macos-14

diff --git a/Plugins/RevolutionaryPlugin/Plugin.swift b/Plugins/RevolutionaryPlugin/Plugin.swift
@@ -10,7 +10,7 @@ struct SwiftTestingRevolutionaryPlugin: CommandPlugin {
         let revolutionaryExecutable = try context.tool(named: "swift-testing-revolutionary")
 
         let argumentsToExecute = arguments
-        try performTool(executablePath: revolutionaryExecutable.path.url, arguments: argumentsToExecute)
+        try performTool(executablePath: revolutionaryExecutable.url, arguments: argumentsToExecute)
     }
 }
 
@@ -29,12 +29,12 @@ extension SwiftTestingRevolutionaryPlugin: XcodeCommandPlugin {
             }
 
             let allTestFiles = target.inputFiles
-                .filter { $0.path.lastComponent.hasSuffix("Tests.swift") }
+                .filter { $0.url.lastPathComponent.hasSuffix("Tests.swift") }
             return files + allTestFiles
         }
 
-        let argumentsToExecute = extractor.remainingArguments + allTestFiles.map { $0.path.string }
-        try performTool(executablePath: revolutionaryExecutable.path.url, arguments: argumentsToExecute)
+        let argumentsToExecute = extractor.remainingArguments + allTestFiles.map { $0.url.path() }
+        try performTool(executablePath: revolutionaryExecutable.url, arguments: argumentsToExecute)
     }
 }
 
@@ -55,8 +55,18 @@ private func performTool(executablePath: URL, arguments: [String]) throws {
     }
 }
 
+#if compiler(<6.0)
+
 extension Path {
     fileprivate var url: URL {
         URL(filePath: string)
     }
 }
+
+extension PluginContext.Tool {
+    fileprivate var url: URL {
+        path.url
+    }
+}
+
+#endif