Update for Swift 5.3 (#10)

* Update CI workflow for Swift 5.3

* Update CI workflow for macOS Big Sur

* Remove and ignore Package.resolved

* Add Swift 5.2 package manifest

* Update for Swift 5.3

Author: mattt

.github/workflows/ci.yml

@@ -7,25 +7,79 @@ on:
     branches: [master]
 
 jobs:
-  macos:
-    runs-on: macOS-latest
+  macos_big_sur:
+    runs-on: macos-11.0
+
+    strategy:
+      matrix:
+        xcode:
+          - "11.7" # Swift 5.2
+          - "12.2" # Swift 5.3
+
+    name: "macOS Big Sur (Xcode ${{ matrix.xcode }})"
 
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+      - uses: actions/cache@v2
+        with:
+          path: .build
+          key: ${{ runner.os }}-spm-xcode-${{ matrix.xcode }}-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-xcode-${{ matrix.xcode }}-
       - name: Build and Test
-        run: swift test
+        run: |
+          swift test
         env:
-          DEVELOPER_DIR: /Applications/Xcode_11.4.app/Contents/Developer
+          DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+
+  macos_catalina:
+    runs-on: macos-10.15
+
+    strategy:
+      matrix:
+        xcode:
+          - "11.7" # Swift 5.2
+          - "12" # Swift 5.3
+
+    name: "macOS Catalina (Xcode ${{ matrix.xcode }})"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - uses: actions/cache@v2
+        with:
+          path: .build
+          key: ${{ runner.os }}-spm-xcode-${{ matrix.xcode }}-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-xcode-${{ matrix.xcode }}-
+      - name: Build and Test
+        run: |
+          swift test
+        env:
+          DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
 
   linux:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        swift: ["5.3", "5.2"]
+
+    name: "Linux (Swift ${{ matrix.swift }})"
+
     container:
-      image: swift:5.2
+      image: swift:${{ matrix.swift }}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+      - uses: actions/cache@v2
+        with:
+          path: .build
+          key: ${{ runner.os }}-spm-swift-${{ matrix.swift }}-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-swift-${{ matrix.swift }}-
       - name: Build and Test
-        run: swift test --enable-test-discovery
+        run: |
+          swift test --enable-test-discovery

.gitignore

@@ -4,3 +4,4 @@
 /*.xcodeproj
 .swiftpm/
 xcuserdata/
+Package.resolved

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -14,7 +14,9 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/apple/swift-syntax.git", .exact("0.50200.0")),
+        .package(name: "SwiftSyntax",
+                 url: "https://github.com/apple/swift-syntax.git",
+                 .exact("0.50300.0")),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

Package.swift

@@ -0,0 +1,32 @@
+// swift-tools-version:5.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "SwiftSemantics",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "SwiftSemantics",
+            targets: ["SwiftSemantics"]
+        ),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        .package(url: "https://github.com/apple/swift-syntax.git",
+                 .exact("0.50200.0")),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "SwiftSemantics",
+            dependencies: ["SwiftSyntax"]
+        ),
+        .testTarget(
+            name: "SwiftSemanticsTests",
+            dependencies: ["SwiftSemantics"]
+        ),
+    ]
+)

[email protected]

@@ -21,7 +21,7 @@ final class DeclarationCollectorTests: XCTestCase {
 
         let collector = DeclarationCollector()
         let tree = try SyntaxParser.parse(source: source)
-        _ = collector.walk(tree)
+        collector.walk(tree)
 
         XCTAssertEqual(collector.imports.count, 1)
         XCTAssertEqual(collector.imports.first?.pathComponents, ["UIKit"])

Tests/SwiftSemanticsTests/DeclarationCollectorTests.swift

@@ -6,7 +6,7 @@ extension SyntaxParser {
     static func declarations<T: Declaration>(of type: T.Type, source: String) throws -> [T] {
         let collector = DeclarationCollector()
         let tree = try parse(source: source)
-        _ = collector.walk(tree)
+        collector.walk(tree)
 
         switch type {
         case is AssociatedType.Type: