Merge pull request #482 from danger/dependency_resolver_check

Fix Dependencies resolver on Xcode 13

Author: f-meloni

.github/workflows/ci.yml

@@ -47,6 +47,47 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+  test-dependencies-resolver:
+    name: Test dependencies resolver
+    runs-on: macOS-11
+    strategy:
+      matrix:
+        xcode: ["12.4", "12.5.1", "13.0"]
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        path: |
+          .build/artifacts
+          .build/checkouts
+          .build/repositories
+        key: ${{ runner.os }}-dependencies-${{ matrix.xcode }}-${{ hashFiles('**/Package.resolved') }}
+        restore-keys: |
+          ${{ runner.os }}-dependencies-${{ matrix.xcode }}-
+          ${{ runner.os }}-dependencies-
+          ${{ runner.os }}-
+
+    - name: Select Xcode
+      run: |
+        xcodebuild -version
+        ls -nt /Applications/ | grep "Xcode*"
+        sudo xcode-select -switch /Applications/Xcode_${{ matrix.xcode }}.app
+        xcodebuild -version
+
+    - name: Install danger-js
+      run: brew install danger/tap/danger-js
+
+    - run: make install
+
+    - run: mkdir DangerTestWithDependencies && mv DangerfileWithDependencies.swift DangerTestWithDependencies/Dangerfile.swift
+
+    - run: cd DangerTestWithDependencies && danger-swift ci --verbose --failOnErrors
+      if: ${{ github.event_name == 'pull_request' }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   test-on-linux:
     name: Test on Linux
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -13,7 +13,7 @@
 
 ## Master
 
-## Next
+- Fix Dependencies resolver on Xcode 13 [@f-meloni][] - [#482](https://github.com/danger/swift/pull/482)
 - Add support for Swift 5.5 and Xcode 13 [@avdlee][] - [#480](https://github.com/danger/swift/pull/480)
 
 ## 3.12.1

Package.resolved

@@ -7,7 +7,7 @@ import PackageDescription
 let package = Package(
     name: "danger-swift",
     products: [
-        .library(name: "Danger", targets: ["Danger"]),
+        .library(name: "Danger", type: .dynamic, targets: ["Danger"]),
         .library(name: "DangerFixtures", targets: ["DangerFixtures"]),
         .library(name: "DangerDeps", type: .dynamic, targets: ["Danger-Swift"]), // dev
         .executable(name: "danger-swift", targets: ["Runner"]),

Package.swift

@@ -5,7 +5,7 @@ import Version
 
 public struct PackageManager {
     enum Errors: Error {
-        case failedToUpdatePackages(String)
+        case failedToUpdatePackages(String, error: String)
         case unrecognizedTagFormat(String)
     }
 
@@ -19,6 +19,7 @@ public struct PackageManager {
     private let packageDataProvider: PackageDataProviding
     private let logger: Logger
     private var masterPackageName: String { "PACKAGES" }
+    private var fakeFile = "Fake.swift"
 
     // MARK: - Init
 
@@ -159,11 +160,14 @@ public struct PackageManager {
             let executor = ShellExecutor()
 
             let toolsVersion = try resolveSwiftToolsVersion(executor: executor, onFolder: generatedFolder)
+            try generatedFolder.createSubfolderIfNeeded(withName: "Sources/\(masterPackageName)")
+            fileCreator.createFile(atPath: generatedFolder.appendingPath("Sources/\(masterPackageName)").appendingPath(fakeFile),
+                                   contents: Data())
             try packageGenerator.generateMasterPackageDescription(forSwiftToolsVersion: toolsVersion)
             try executeSwiftCommand("package update", onFolder: generatedFolder, arguments: [], executor: executor)
             try generatedFolder.createSubfolderIfNeeded(withName: "Packages")
         } catch {
-            throw Errors.failedToUpdatePackages(folder)
+            throw Errors.failedToUpdatePackages(generatedFolder, error: "\(error)")
         }
     }