Merge branch 'master' into jflan/pipe-overfill

Author: f-meloni

CHANGELOG.md

@@ -15,9 +15,13 @@
 
 - Drain stdout while shell commands are running to prevent execution from locking up if there's too much output [@jflan-dd][] - [#614](https://github.com/danger/swift/pull/614)
 
+## 3.20.0
+- Remove deprecated `lint` function with `lintAllFiles` flag [@417-72KI][] - [#622](https://github.com/danger/swift/pull/622)
+- Updated Swift 6 build process: Danger files moved to .build/debug/Modules, and SwiftFormat module map conflict resolved by adjusting the Swift import search path. [@abhi-m-simformsolutons][] -[#626](https://github.com/danger/swift/pull/626)
+
 ## 3.19.1
 
-- Expose markdownKit on Swiftlint.lint() for customizing the output [@nikoloutsos][] - [#609](https://github.com/danger/swift/pull/609)
+- Expose markdownKit on Swiftlint.lint() for customizing the output [@nikoloutsos][] - [#610](https://github.com/danger/swift/pull/610)
 - Drop Swift 5.7 [@417-72KI][] - [#620](https://github.com/danger/swift/pull/620)
 - Fix pattern for detecting SwiftLint in package [@417-72KI][] - [#616](https://github.com/danger/swift/pull/616)
 - Allow optional GitLab MR description [@kvvzr][] - [#609](https://github.com/danger/swift/pull/609)

Package.resolved

@@ -37,32 +37,6 @@ public enum SwiftLint {
     static let danger = Danger()
     static let shellExecutor = ShellExecutor()
 
-    /// This method is deprecated in favor of
-    @available(*, deprecated, message: "Use the lint(_ lintStyle ..) method instead.")
-    @discardableResult
-    public static func lint(inline: Bool = false,
-                            directory: String? = nil,
-                            configFile: String? = nil,
-                            strict: Bool = false,
-                            quiet: Bool = true,
-                            lintAllFiles: Bool = false,
-                            swiftlintPath: String? = nil) -> [SwiftLintViolation] {
-        let lintStyle: LintStyle = {
-            if lintAllFiles {
-                return .all(directory: directory)
-            } else {
-                return .modifiedAndCreatedFiles(directory: directory)
-            }
-        }()
-
-        return lint(lintStyle,
-                    inline: inline,
-                    configFile: configFile,
-                    strict: strict,
-                    quiet: quiet,
-                    swiftlintPath: swiftlintPath)
-    }
-
     /// When the swiftlintPath is not specified,
     /// it uses by default swift run swiftlint if the Package.swift in your root folder contains swiftlint as dependency,
     /// otherwise calls directly the swiftlint command
@@ -73,13 +47,15 @@ public enum SwiftLint {
                             configFile: String? = nil,
                             strict: Bool = false,
                             quiet: Bool = true,
-                            swiftlintPath: String?) -> [SwiftLintViolation] {
+                            swiftlintPath: String,
+                            markdownAction: (String) -> Void = markdown) -> [SwiftLintViolation] {
         lint(lintStyle,
              inline: inline,
              configFile: configFile,
              strict: strict,
              quiet: quiet,
-             swiftlintPath: swiftlintPath.map(SwiftlintPath.bin))
+             swiftlintPath: .bin(swiftlintPath),
+             markdownAction: markdownAction)
     }
 
     /// This is the main entry point for linting Swift in PRs.
@@ -209,7 +185,7 @@ extension SwiftLint {
         var arguments = arguments
 
         if let directory = directory {
-            arguments.append("--path \"\(directory)\"")
+            arguments.append(directory)
         }
 
         return swiftlintViolations(swiftlintPath: swiftlintPath,

Sources/Danger/Plugins/SwiftLint/SwiftLint.swift

@@ -60,7 +60,7 @@ func runDanger(version dangerSwiftVersion: String, logger: Logger) throws {
     if let spmDanger = SPMDanger() {
         spmDanger.buildDependencies(executor: executor)
         libArgs += ["-L", spmDanger.buildFolder]
-        libArgs += ["-I", spmDanger.buildFolder]
+        libArgs += ["-I", spmDanger.moduleFolder]
         libArgs += [spmDanger.swiftcLibImport]
     } else {
         guard let libDangerPath = Runtime.getLibDangerPath() else {

Sources/Runner/Commands/Runner.swift

@@ -3,7 +3,7 @@ import Logger
 import RunnerLib
 
 /// Version for showing in verbose mode
-let DangerVersion = "3.19.1" // swiftlint:disable:this identifier_name
+let DangerVersion = "3.20.0" // swiftlint:disable:this identifier_name
 let MinimumDangerJSVersion = "6.1.6" // swiftlint:disable:this identifier_name
 
 private func runCommand(_ command: DangerCommand, logger: Logger) throws {

Sources/Runner/main.swift

@@ -10,6 +10,14 @@ public struct SPMDanger {
         fileManager.currentDirectoryPath + "/.build/debug"
     }
 
+    public var moduleFolder: String {
+        #if compiler(<6.0)
+            buildFolder
+        #else
+            buildFolder + "/Modules"
+        #endif
+    }
+
     public init?(
         packagePath: String = "Package.swift",
         readFile: (String) -> String? = { try? String(contentsOfFile: $0) },

Sources/RunnerLib/SPMDanger.swift

@@ -268,7 +268,7 @@ final class DangerSwiftLintTests: XCTestCase {
         XCTAssertNotNil(swiftlintCommand)
         XCTAssertEqual(swiftlintCommand!.environmentVariables.count, 0)
         XCTAssertFalse(swiftlintCommand!.environmentVariables.values.contains { $0.contains("Tests/SomeFile.swift") })
-        XCTAssertTrue(swiftlintCommand!.arguments.contains("--path \"Tests\""))
+        XCTAssertEqual(swiftlintCommand!.arguments.last, directory)
     }
 
     func testFiltersOnSwiftFiles() {