Bump Swift Syntax (#1)

Author: davdroman

.github/workflows/ci.yml

@@ -26,17 +26,41 @@ jobs:
           - macOS
           - tvOS
           - watchOS
-        swift:
-          - "6.0"
-          - "6.1"
+        xcode:
+          - "16.2"
+          - "16.4"
+          - "26.0"
         include:
-          - action: test
+          - xcode: "16.2"
+            swift: "6.0"
+          - xcode: "16.4"
+            swift: "6.1"
+          - xcode: "26.0"
+            swift: "6.2"
     steps:
-      - uses: actions/checkout@v4
-      - uses: mxcl/xcodebuild@v3
+      - name: Git Checkout
+        uses: actions/checkout@v4
+
+      - name: Select Xcode version
+        uses: mxcl/xcodebuild@v3
+        with:
+          xcode: ~${{ matrix.xcode }}
+          action: none
+          verbosity: xcbeautify
+
+      - name: Remove Derived Data
+        run: rm -rf ~/Library/Developer/Xcode/DerivedData
+
+      - if: ${{ matrix.platform != 'macOS' }}
+        name: Download Default Runtime
+        run: xcodebuild -downloadPlatform ${{ matrix.platform }}
+
+      - name: Test Library
+        uses: mxcl/xcodebuild@v3
         with:
-          action: ${{ matrix.action }}
+          action: test
           platform: ${{ matrix.platform }}
-          swift: ~${{ matrix.swift }}
+          xcode: ~${{ matrix.xcode }}
           workspace: ObjCRuntimeTools.xcworkspace
           scheme: ObjCRuntimeTools
+          verbosity: xcbeautify

ObjCRuntimeTools.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -38,10 +38,9 @@ package.targets += [
 		name: "AssociationMacro",
 		dependencies: [
 			.product(name: "SwiftSyntax", package: "swift-syntax"),
+			.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
 			.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
 			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
-			.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-			.product(name: "SwiftParserDiagnostics", package: "swift-syntax"),
 		]
 	),
 
@@ -51,6 +50,7 @@ package.targets += [
 			"Association",
 			"AssociationMacro",
 			.product(name: "MacroTesting", package: "swift-macro-testing"),
+			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
 		]
 	),
 ]
@@ -66,11 +66,10 @@ package.targets += [
 	.macro(
 		name: "SwizzlingMacro",
 		dependencies: [
-			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
 			.product(name: "SwiftSyntax", package: "swift-syntax"),
-			.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
 			.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-			.product(name: "SwiftParserDiagnostics", package: "swift-syntax"),
+			.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
+			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
 		]
 	),
 
@@ -80,11 +79,12 @@ package.targets += [
 			"Swizzling",
 			"SwizzlingMacro",
 			.product(name: "MacroTesting", package: "swift-macro-testing"),
+			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
 		]
 	),
 ]
 
 package.dependencies += [
 	.package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.6.0"),
-	.package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0"),
+	.package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0"),
 ]

Package.resolved

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#if os(macOS) // NB: can only test macros on macOS
+#if canImport(AssociationMacro)
 import MacroTesting
 import SwiftSyntaxMacros
 import SwiftSyntaxMacrosTestSupport
@@ -31,9 +31,9 @@ import Testing
 
 @Suite(
 	.macros(
+		["Associated": AssociatedMacro.self],
 		indentationWidth: .tab,
-		record: .never,
-		macros: ["Associated": AssociatedMacro.self]
+		record: .never
 	)
 )
 struct AssociatedTests {

Package.swift

@@ -20,7 +20,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-#if os(macOS) // NB: can only test macros on macOS
+#if canImport(AssociationMacro)
 import SwiftSyntax
 import SwiftSyntaxBuilder
 import Testing

Tests/AssociationTests/AssociatedMacroTests.swift

@@ -1,14 +1,14 @@
-#if os(macOS) // NB: can only test macros on macOS
+#if canImport(SwizzlingMacro)
 import MacroTesting
 import Swizzling
 import SwizzlingMacro
 import Testing
 
 @Suite(
 	.macros(
+		["swizzle": SwizzleMacro.self],
 		indentationWidth: .tab,
-		record: .failed,
-		macros: ["swizzle": SwizzleMacro.self]
+		record: .failed
 	)
 )
 struct SwizzleMacroTests {}