Cleanup

Author: Rob Amos

Package.swift

@@ -20,39 +20,33 @@ let package = Package(
 //        .library(name: "Vexillographer", targets: [ "Vexillographer" ]),
     ],
 
-    dependencies: .init {
-        Package.Dependency.package(url: "https://github.com/apple/swift-async-algorithms.git", from: "1.0.0")
-        Package.Dependency.package(url: "https://github.com/nicklockwood/SwiftFormat.git", from: "0.54.1")
-        Package.Dependency.package(url: "https://github.com/swiftlang/swift-syntax.git", .upToNextMajor(from: "600.0.1"))
-    },
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-async-algorithms.git", from: "1.0.0"),
+        .package(url: "https://github.com/nicklockwood/SwiftFormat.git", from: "0.54.1"),
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", "600.0.0"..<"603.0.0"),
+    ],
 
-    targets: .init {
+    targets: [
 
         // Vexil
 
-        Target.target(
+        .target(
             name: "Vexil",
             dependencies: [
                 .target(name: "VexilMacros"),
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
-            ],
-            swiftSettings: [
-                .swiftLanguageMode(.v6),
             ]
-        )
-        Target.testTarget(
+        ),
+        .testTarget(
             name: "VexilTests",
-            dependencies: .init {
-                Target.Dependency.target(name: "Vexil")
-            },
-            swiftSettings: [
-                .swiftLanguageMode(.v6),
+            dependencies: [
+                .target(name: "Vexil")
             ]
-        )
+        ),
 
         // Vexillographer
 
-//        Target.target(
+//        .target(
 //            name: "Vexillographer",
 //            dependencies: [
 //                .target(name: "Vexil"),
@@ -61,66 +55,29 @@ let package = Package(
 
         // Macros
 
-        Target.macro(
+        .macro(
             name: "VexilMacros",
             dependencies: [
                 .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
                 .product(name: "SwiftSyntax", package: "swift-syntax"),
                 .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
-            ],
-            swiftSettings: [
-                .swiftLanguageMode(.v6),
             ]
-        )
-
-#if !os(Linux)
+        ),
 
         // We can't disable macro validation using `swift test` so these are guaranteed to fail on Linux
-        Target.testTarget(
+        .testTarget(
             name: "VexilMacroTests",
             dependencies: [
                 .target(name: "VexilMacros"),
                 .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
-            ],
-            swiftSettings: [
-                .swiftLanguageMode(.v6),
             ]
-        )
-
-#endif
+        ),
 
-    },
+    ],
 
     swiftLanguageModes: [
         .v6,
     ]
 
 )
-
-// MARK: - Helpers
-
-@resultBuilder
-enum CollectionBuilder<Element> {
-
-    typealias Component = [Element]
-
-    static func buildExpression(_ expression: Element) -> Component {
-        [expression]
-    }
-
-    static func buildBlock(_ components: Component...) -> Component {
-        components.flatMap { $0 }
-    }
-
-    static func buildLimitedAvailability(_ components: [Element]) -> Component {
-        components
-    }
-
-}
-
-extension Array {
-    init(@CollectionBuilder<Element> collecting: () -> [Element]) {
-        self = collecting()
-    }
-}

Sources/VexilMacros/Plugin.swift

@@ -11,13 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-//
-//  Plugin.swift
-//  Vexil: VexilMacros
-//
-//  Created by Rob Amos on 11/6/2023.
-//
-
 import SwiftCompilerPlugin
 import SwiftSyntaxMacros