Merge pull request #626 from abhi-m-simformsolutons/fix_swift6-module-path

Author: f-meloni

CHANGELOG.md

@@ -13,6 +13,7 @@
 
 ## Master
 - 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
 

Sources/Runner/Commands/Runner.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/RunnerLib/SPMDanger.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) },