[CHORE] Updating to swift-syntax 601.0.1 for Swift 6.1+

Author: mobrien-ghost

.github/workflows/unit-tests.yml

@@ -23,7 +23,25 @@ on:
 
 jobs:
   swift_tests_latest:
-    name: Latest Swift
+    name: Latest Swift (6.1)
+    runs-on: macos-15
+    steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: .build
+          key: macos-latest-spm-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            macos-latest-tests-spm-
+      - name: Build
+        run: swift build
+      - name: Run tests
+        run: swift test
+  swift_tests_600:
+    name: Swift 6.0
     runs-on: macos-15
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
@@ -35,12 +53,12 @@ jobs:
           path: .build
           key: macos-latest-spm-${{ hashFiles('**/Package.resolved') }}
           restore-keys: |
-            macos-latest-spm-
+            macos-600-tests-spm-
       - name: Build
         run: swift build
       - name: Run tests
         run: swift test
-  swift_tests_previous:
+  swift_tests_510:
     name: Swift 5.10
     runs-on: macos-14
     steps:
@@ -53,7 +71,9 @@ jobs:
           path: .build
           key: macos-14-swift-510-spm-${{ hashFiles('**/Package.resolved') }}
           restore-keys: |
-            macos-14-swift-510-spm-
+            macos-14-swift-510-tests-spm-
+      - name: Remove Resolved
+        run: rm -rf Package.resolved
       - name: Build
         run: swift build
       - name: Run tests
@@ -78,7 +98,9 @@ jobs:
           path: .build
           key: ${{ matrix.os }}-${{ matrix.swift }}-spm-${{ hashFiles('**/Package.resolved') }}
           restore-keys: |
-            ${{ matrix.os }}-spm-
+            ${{ matrix.os }}-tests-spm-
+      - name: Remove Resolved
+        run: rm -rf Package.resolved
       - name: Build
         run: swift build
       - name: Run tests

Package.resolved

@@ -1,4 +1,5 @@
 {
+  "originHash" : "32be71fe074b39617009f0851e8d4608c0271562fc8eb32489db8d0cfa2d9582",
   "pins" : [
     {
       "identity" : "spimanifest",
@@ -14,19 +15,19 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
-        "revision" : "0687f71944021d616d34d922343dcef086855920",
-        "version" : "600.0.1"
+        "revision" : "f99ae8aa18f0cf0d53481901f88a0991dc3bd4a2",
+        "version" : "601.0.1"
       }
     },
     {
       "identity" : "yams",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/jpsim/Yams.git",
       "state" : {
-        "revision" : "3036ba9d69cf1fd04d433527bc339dc0dc75433d",
-        "version" : "5.1.3"
+        "revision" : "b4b8042411dc7bbb696300a34a4bf3ba1b7ad19b",
+        "version" : "5.3.1"
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -20,7 +20,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "600.0.1"),
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "601.0.1"),
     ],
     targets: [
         .target(

[email protected]

@@ -0,0 +1,51 @@
+// swift-tools-version: 6.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "SyntaxSparrow",
+    platforms: [
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .tvOS(.v13),
+        .watchOS(.v6),
+        .macCatalyst(.v13)
+    ],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "SyntaxSparrow",
+            targets: ["SyntaxSparrow"]
+        ),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "600.0.1"),
+    ],
+    targets: [
+        .target(
+            name: "SyntaxSparrow",
+            dependencies: [
+                .product(name: "SwiftSyntax", package: "swift-syntax"),
+                .product(name: "SwiftParser", package: "swift-syntax"),
+            ],
+            resources: [
+                .copy("Resources/PrivacyInfo.xcprivacy")
+            ],
+            swiftSettings: [
+                .swiftLanguageMode(.v6)
+            ]
+        ),
+        .testTarget(
+            name: "SyntaxSparrowTests",
+            dependencies: [
+                "SyntaxSparrow",
+            ]
+        ),
+    ]
+)
+
+// Supplementary
+package.dependencies.append(contentsOf: [
+    .package(url: "https://github.com/SwiftPackageIndex/SPIManifest.git", from: "0.12.0"),
+])

Sources/SyntaxSparrow/Public/Semantics/Components/EntityType.swift

@@ -139,4 +139,16 @@ public enum EntityType: Equatable, Hashable, CustomStringConvertible {
     public init(_ typeSyntax: TypeSyntax) {
         self = EntityType.parseType(typeSyntax)
     }
+
+    #if swift(>=6.1)
+    /// Creates a new ``SyntaxSparrow/EntityType`` instance from a `GenericArgumentSyntax.Argument` node.
+    public init(_ argument: GenericArgumentSyntax.Argument) {
+        switch argument {
+        case .type(let typeSyntax):
+            self = EntityType.parseType(typeSyntax)
+        default:
+            self = .empty
+        }
+    }
+    #endif
 }