Merge pull request #14 from SwiftPackageIndex/swift-5.8

Add support for Swift 5.8

Author: finestructure

.github/workflows/ci.yml

@@ -17,55 +17,45 @@ name: CI
 on:
   push:
     branches: [ '*' ]
-    pull_request: [ main ]
+  pull_request:
+    branches: [ main ]
 
 jobs:
-  build:
+  macos:
     strategy:
       fail-fast: false
       matrix:
         # https://github.com/actions/virtual-environments
-        os: [macos-12, macos-11, ubuntu-20.04]
-
+        os: [macos-13, macos-12, macos-11]
     runs-on: ${{ matrix.os }}
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
-
     steps:
     - uses: actions/checkout@v2
-    - name: Release Build
+    - name: Test
+      run: make test
+    - name: Build for release
       run: make build
+    - name: Install
+      run: env prefix=/tmp make install
+    - name: Uninstall
+      run: env prefix=/tmp make uninstall
 
-  test:
+  linux:
     strategy:
       fail-fast: false
       matrix:
-        # https://github.com/actions/virtual-environments
-        os: [macos-12, macos-11, ubuntu-20.04]
-
-    runs-on: ${{ matrix.os }}
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
-
+        image: ['swift:5.7-focal', 'swift:5.8-focal']
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ matrix.image }}
     steps:
     - uses: actions/checkout@v2
+    - run: apt-get -y update && apt-get install make
     - name: Test
       run: make test
-
-  install:
-    strategy:
-      fail-fast: false
-      matrix:
-        # https://github.com/actions/virtual-environments
-        os: [macos-12, macos-11, ubuntu-20.04]
-
-    runs-on: ${{ matrix.os }}
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
-
-    steps:
-    - uses: actions/checkout@v2
+    - name: Build for release
+      run: make build
     - name: Install
       run: env prefix=/tmp make install
     - name: Uninstall
       run: env prefix=/tmp make uninstall
+  

Package.resolved

@@ -28,9 +28,7 @@ let package = Package(
         .package(url: "https://github.com/SwiftPackageIndex/SemanticVersion",
                  from: "0.3.1"),
         .package(url: "https://github.com/apple/swift-argument-parser",
-                 from: "1.0.0"),
-        .package(url: "https://github.com/pointfreeco/swift-parsing",
-                 from: "0.4.1"),
+                 from: "1.0.0")
     ],
     targets: [
         .executableTarget(
@@ -47,7 +45,18 @@ let package = Package(
         ),
         .testTarget(
             name: "ReleaseNotesTests",
-            dependencies: ["ReleaseNotesCore"]
+            dependencies: ["ReleaseNotesCore"],
+            exclude: ["Fixtures"]
         ),
     ]
 )
+
+#if compiler(<5.8)
+package.dependencies.append(
+    .package(url: "https://github.com/pointfreeco/swift-parsing", revision: "0.11.0")
+)
+#else
+package.dependencies.append(
+    .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.12.0")
+)
+#endif

Package.swift

@@ -18,10 +18,17 @@ import SemanticVersion
 
 enum Parser {
 
+#if compiler(<5.8)
     static let dependencyStart = Parse {
         Int.parser()
         Skip { " dependenc" }
     }
+#else
+    static let dependencyStart = Parse(input: Substring.self) {
+        Int.parser()
+        Skip { " dependenc" }
+    }
+#endif
 
     static let progressLine = Parse {
         Not { dependencyStart }
@@ -30,6 +37,7 @@ enum Parser {
 
     static let progress = Many { progressLine }
 
+#if compiler(<5.8)
     static let dependencyCount = Parse {
         Int.parser()
         Skip {
@@ -40,11 +48,23 @@ enum Parser {
             }
         }
     }
+#else
+    static let dependencyCount = Parse(input: Substring.self) {
+        Int.parser()
+        Skip {
+            OneOf {
+                " dependency has changed:"
+                " dependencies have changed:"
+                " dependencies have changed."
+            }
+        }
+    }
+#endif
 
     static let semanticVersion = Parse(Revision.tag) {
         Prefix { $0 != " " }
-        .map { (s: Substring) -> String in return String.init(s) }
-        .compactMap(SemanticVersion.init)
+            .map { (s: Substring) -> String in return String.init(s) }
+            .compactMap(SemanticVersion.init)
     }
 
     static let revision = OneOf {
@@ -56,10 +76,15 @@ enum Parser {
 
     static let newPackageToken: Character = "+"
     static let updatedRevisionToken: Character = "~"
+#if compiler(<5.8)
     static let upToStart = Parse {
         Prefix { $0 != newPackageToken && $0 != updatedRevisionToken }
     }
-
+#else
+    static let upToStart = Parse(input: Substring.self) {
+        Prefix { $0 != newPackageToken && $0 != updatedRevisionToken }
+    }
+#endif
     static let newPackage = Parse { Update(packageId: $0, oldRevision: nil) } with: {
         Skip {
             upToStart
@@ -92,6 +117,7 @@ enum Parser {
 
     static let updates = Many(element: { update }, separator: { "\n" })
 
+#if compiler(<5.8)
     static let packageUpdate = Parse { (count, updates) -> [Update] in
         assert(updates.count == count)
         return updates
@@ -102,4 +128,17 @@ enum Parser {
         updates
         Skip { Many { "\n" } }
     }
+#else
+    static let packageUpdate = Parse {
+        Skip { progress }
+        Skip { Many { "\n" } }
+        dependencyCount
+        updates
+        Skip { Many { "\n" } }
+    }.map { (count: Int, updates: [Update]) in
+        assert(updates.count == count)
+        return updates
+    }
+#endif
+
 }