Emit modules dependencies

Author: polac24

Sources/XCRemoteCache/Commands/SwiftFrontend/SwiftFrontendArgInput.swift

@@ -145,7 +145,8 @@ public struct SwiftFrontendArgInput {
                     file: primaryInputFilesURLs[i],
                     dependencies: dependenciesPaths.get(i).map(URL.init(fileURLWithPath:)),
                     object: outputPaths.get(i).map(URL.init(fileURLWithPath:)),
-                    swiftDependencies: dependenciesPaths.get(i).map(URL.init(fileURLWithPath:))
+                    // for now - swift-dependencies are not requested in the driver compilation mode
+                    swiftDependencies: nil
                 )
                 return new
             }
@@ -156,7 +157,7 @@ public struct SwiftFrontendArgInput {
                 steps: steps,
                 outputs: .map(compilationFileMap),
                 target: target,
-                inputs: .list(outputPaths),
+                inputs: .list(inputPaths),
                 exampleWorkspaceFilePath: outputPaths[0]
             )
         } else {
@@ -185,7 +186,8 @@ public struct SwiftFrontendArgInput {
                 compileFilesScope: .none,
                 emitModule: SwiftcContext.SwiftcStepEmitModule(
                     objcHeaderOutput: URL(fileURLWithPath: objcHeaderOutput),
-                    modulePathOutput: URL(fileURLWithPath: outputPaths[0])
+                    modulePathOutput: URL(fileURLWithPath: outputPaths[0]),
+                    dependencies: URL(fileURLWithPath: dependenciesPaths[0])
                 )
             )
             return try .init(
@@ -194,7 +196,7 @@ public struct SwiftFrontendArgInput {
                 steps: steps,
                 outputs: .map([:]),
                 target: target,
-                inputs: .list([]),
+                inputs: .list(inputPaths),
                 exampleWorkspaceFilePath: objcHeaderOutput
             )
         }

Sources/XCRemoteCache/Commands/Swiftc/SwiftcContext.swift

@@ -23,6 +23,7 @@ public struct SwiftcContext {
     public struct SwiftcStepEmitModule {
         let objcHeaderOutput: URL
         let modulePathOutput: URL
+        let dependencies: URL?
     }
     public enum SwiftcStepCompileFilesScope {
         case none
@@ -126,7 +127,8 @@ public struct SwiftcContext {
             compileFilesScope: .all,
             emitModule: SwiftcStepEmitModule(
                 objcHeaderOutput: URL(fileURLWithPath: (input.objcHeaderOutput)),
-                modulePathOutput: URL(fileURLWithPath: input.modulePathOutput)
+                modulePathOutput: URL(fileURLWithPath: input.modulePathOutput),
+                dependencies: nil
             )
         )
         let outputs = CompilationFilesOutputs.fileMap(input.filemap)

Sources/XCRemoteCache/Commands/Swiftc/XCSwiftc.swift

@@ -78,6 +78,9 @@ public class XCSwiftAbstract<InputArgs> {
         let markerWriter = FileMarkerWriter(markerURL, fileAccessor: fileManager)
 
         let inputReader: SwiftcInputReader
+        // TODO: consider renaming
+        // outputs and outputs of the swift step are described in a map together
+        // and the file/list is named "output"
         switch context.outputs {
         case .fileMap(let path):
             inputReader = SwiftcFilemapInputEditor(URL(fileURLWithPath: path), fileManager: fileManager)
@@ -86,7 +89,7 @@ public class XCSwiftAbstract<InputArgs> {
             // TODO: check if first 2 ars can always be `nil`
             // with Xcode 13, inputs via cmd are only used for compilations
             inputReader = StaticSwiftcInputReader(
-                moduleDependencies: nil,
+                moduleDependencies: context.steps.emitModule?.dependencies,
                 swiftDependencies: nil,
                 compilationFiles: Array(map.values)
             )

Sources/XCRemoteCache/Utils/Array+Utils.swift

@@ -21,7 +21,7 @@ import Foundation
 
 public extension Array {
     func get(_ i: Index) -> Element? {
-        guard count < i else {
+        guard count > i else {
             return nil
         }
         return self[i]