Merge remote-tracking branch 'original/master'

Author: Oscar Costoya Vidal

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["13.2.1", "13.4.1", "14.0.1"]
+        xcode: ["13.2.1", "13.4.1", "14.1"]
     steps:
     - uses: actions/checkout@v2
 
@@ -57,7 +57,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["13.2.1", "13.4.1", "14.0.1"]
+        xcode: ["13.2.1", "13.4.1", "14.1"]
     steps:
     - uses: actions/checkout@v2
 
@@ -94,11 +94,11 @@ jobs:
 
   test-on-linux:
     name: Test on Linux
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        swift: ["5.4.3", "5.5.3", "5.6.3", "5.7"]
+        swift: ["5.5.3", "5.6.3", "5.7"]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
@@ -124,7 +124,7 @@ jobs:
 
     - uses: YOCKOW/Action-setup-swift@v1
 
-    - run: swift test
+    - run: swift test --enable-test-discovery
 
     - run: swift run danger-swift ci --verbose --failOnErrors
       if: ${{ github.event_name == 'pull_request' }}
@@ -137,7 +137,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["13.2.1", "13.4.1", "14.0.1"]
+        xcode: ["13.2.1", "13.4.1", "14.1"]
     steps:
     - uses: actions/checkout@v2
 
@@ -172,11 +172,11 @@ jobs:
 
   test-without-spm-on-linux:
     name: Test without SPM on Linux
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        swift: ["5.4.3", "5.5.3", "5.6.3", "5.7"]
+        swift: ["5.5.3", "5.6.3", "5.7"]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2

.swift-version

@@ -1 +1 @@
-5.4
+5.5

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:5.4
+// swift-tools-version:5.5
 
 import PackageDescription
 
@@ -13,17 +13,31 @@ let devProducts: [Product] = isDevelop
     ] : []
 let devDependencies: [Package.Dependency] = isDevelop
     ? [
-        .package(url: "https://github.com/shibapm/Komondor", from: "1.1.3"),
-        .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.49.4"),
-        .package(url: "https://github.com/Realm/SwiftLint", from: "0.46.2"),
-        .package(name: "SnapshotTesting", url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.7.1"),
+        .package(url: "https://github.com/shibapm/Komondor", from: "1.1.4"),
+        .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.50.5"),
+        .package(url: "https://github.com/Realm/SwiftLint", from: "0.48.0"),
+        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.10.0"),
         .package(url: "https://github.com/shibapm/Rocket", from: "1.2.1"),
     ] : []
 let devTargets: [Target] = isDevelop
     ? [
-        .testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]),
-        .testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"], exclude: ["__Snapshots__"]),
-        .testTarget(name: "DangerDependenciesResolverTests", dependencies: ["DangerDependenciesResolver", "SnapshotTesting"], exclude: ["__Snapshots__"]),
+        .testTarget(name: "DangerTests",
+                    dependencies: [
+                        "Danger",
+                        "DangerFixtures",
+                        .product(name: "SnapshotTesting", package: "swift-snapshot-testing")
+                    ]),
+        .testTarget(name: "RunnerLibTests",
+                    dependencies: [
+                        "RunnerLib",
+                        .product(name: "SnapshotTesting", package: "swift-snapshot-testing")
+        ], exclude: ["__Snapshots__"]),
+        .testTarget(name: "DangerDependenciesResolverTests",
+                    dependencies: [
+                        "DangerDependenciesResolver",
+                        .product(name: "SnapshotTesting", package: "swift-snapshot-testing")
+                    ],
+                    exclude: ["__Snapshots__"]),
     ]
     : []
 
@@ -36,8 +50,8 @@ let package = Package(
     ] + devProducts,
     dependencies: [
         .package(url: "https://github.com/shibapm/Logger", from: "0.1.0"),
-        .package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
-        .package(name: "OctoKit", url: "https://github.com/nerdishbynature/octokit.swift", from: "0.11.0"),
+        .package(url: "https://github.com/mxcl/Version", from: "2.0.1"),
+        .package(name: "OctoKit", url: "https://github.com/nerdishbynature/octokit.swift", from: "0.12.0"),
     ] + devDependencies,
     targets: [
         .target(name: "Danger-Swift", dependencies: ["Danger"]),

Package.swift

@@ -7,12 +7,13 @@ Write your Dangerfiles in Swift.
 
 ### Requirements
 
-Latest version requires Swift 5.4
+Latest version requires Swift 5.5
 
 If you are using an older Swift, use the supported version according to next table.
 
 | Swift version | Danger support version |
 | ------------- | ---------------------- |
+| 5.4           | v3.15.0                |
 | 5.3           | v3.13.0                |
 | 5.2           | v3.11.1                |
 | 5.1           | v3.8.0                 |
@@ -182,7 +183,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Danger
-        uses: danger/swift@3.13.0
+        uses: danger/swift@3.15.0
         with:
             args: --failOnErrors --no-publish-check
         env:
@@ -203,7 +204,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Danger
-        uses: docker://ghcr.io/danger/danger-swift:3.13.0
+        uses: docker://ghcr.io/danger/danger-swift:3.15.0
         with:
             args: --failOnErrors --no-publish-check
         env:
@@ -231,7 +232,7 @@ swift run danger-swift command --cwd path/to/working-directory
 
 #### Dev
 
-You need to be using Xcode >= 11.3.1.
+You need to be using Xcode >= 13.2.1.
 
 ```sh
 git clone https://github.com/danger/danger-swift.git

README.md

@@ -21,8 +21,4 @@ final class ViolationTests: XCTestCase {
         XCTAssertEqual(subject.file, "/Users/ash/bin/Harvey/Sources/Harvey/Harvey.swift")
         XCTAssertEqual(subject.severity, .warning)
     }
-
-    static var allTests = [
-        ("testDecoding", testDecoding),
-    ]
 }