Removing more code

Author: goergisn

Package.swift

@@ -34,8 +34,6 @@ let package = Package(
                 // Copy Tests/ExampleTests/Resources directories as-is.
                 // Use to retain directory structure.
                 // Will be at top level in bundle.
-                .copy("Resources/dummy.abi.json"),
-                .copy("Resources/dummi-abi-flat-definition.md"),
                 .copy("Resources/expected-reference-changes.md")
             ]
         ),
@@ -46,7 +44,6 @@ let package = Package(
                 // Copy Tests/ExampleTests/Resources directories as-is.
                 // Use to retain directory structure.
                 // Will be at top level in bundle.
-                .copy("Resources/expected-reference-changes-sdk-dump.md"),
                 .copy("Resources/expected-reference-changes-swift-interface-private.md"),
                 .copy("Resources/expected-reference-changes-swift-interface-public.md")
             ]

Sources/Helpers/SwiftPackageFileHelper.swift

@@ -27,13 +27,18 @@ struct SwiftPackageFileHelper {
 
     private let fileHandler: FileHandling
     private let xcodeTools: XcodeTools
+    private let shell: any ShellHandling
+    private let logger: (any Logging)?
 
     init(
         fileHandler: FileHandling,
-        xcodeTools: XcodeTools
+        shell: any ShellHandling,
+        logger: (any Logging)?
     ) {
         self.fileHandler = fileHandler
-        self.xcodeTools = xcodeTools
+        self.xcodeTools = XcodeTools(shell: shell, fileHandler: fileHandler, logger: logger)
+        self.shell = shell
+        self.logger = logger
     }
 
     static func packagePath(for projectDirectoryPath: String) -> String {
@@ -93,7 +98,7 @@ private extension SwiftPackageFileHelper {
 
     func generatePackageDescription(at projectDirectoryPath: String) throws -> SwiftPackageDescription {
 
-        let result = try xcodeTools.loadPackageDescription(projectDirectoryPath: projectDirectoryPath)
+        let result = try loadPackageDescription(projectDirectoryPath: projectDirectoryPath)
 
         let newLine = "\n"
         let errorTag = "error: "
@@ -133,6 +138,17 @@ private extension SwiftPackageFileHelper {
         throw SwiftPackageFileHelperError.couldNotGeneratePackageDescription
     }
 
+    func loadPackageDescription(
+        projectDirectoryPath: String
+    ) throws -> String {
+        let command = [
+            "cd \(projectDirectoryPath);",
+            "swift package describe --type json"
+        ]
+        
+        return shell.execute(command.joined(separator: " "))
+    }
+    
     func decodePackageDescription(from packageDescriptionData: Data, warnings: [String]) throws -> SwiftPackageDescription {
         var packageDescription = try JSONDecoder().decode(SwiftPackageDescription.self, from: packageDescriptionData)
         packageDescription.warnings = warnings

Sources/Helpers/XcodeTools.swift

@@ -35,56 +35,6 @@ struct XcodeTools {
         self.logger = logger
     }
 
-    func loadPackageDescription(
-        projectDirectoryPath: String
-    ) throws -> String {
-        let command = [
-            "cd \(projectDirectoryPath);",
-            "swift package describe --type json"
-        ]
-        
-        return shell.execute(command.joined(separator: " "))
-    }
-    
-    func build(
-        projectDirectoryPath: String,
-        scheme: String,
-        projectType: ProjectType
-    ) throws {
-        var commandComponents = [
-            "cd \(projectDirectoryPath);",
-            "xcodebuild -scheme \"\(scheme)\"",
-            "-derivedDataPath \(Constants.derivedDataPath)",
-            iOSTarget,
-            "-destination \"platform=iOS,name=Any iOS Device\""
-        ]
-        
-        switch projectType {
-        case .swiftPackage:
-            commandComponents += ["-skipPackagePluginValidation"]
-        case .xcodeProject:
-            break // Nothing to add
-        }
-        
-        let command = commandComponents.joined(separator: " ")
-        
-        // print("👾 \(command.joined(separator: " "))")
-        logger?.log("🏗️ Building \(scheme) from `\(projectDirectoryPath)`", from: String(describing: Self.self))
-        let result = shell.execute(command)
-        
-        if 
-            !fileHandler.fileExists(atPath: "\(projectDirectoryPath)/\(Constants.derivedDataPath)") ||
-            result.range(of: "xcodebuild: error:") != nil ||
-            result.range(of: "BUILD FAILED") != nil
-        {
-            print(result)
-            throw XcodeToolsError(
-                errorDescription: "💥 Building project failed",
-                underlyingError: result
-            )
-        }
-    }
-    
     func archive(
         projectDirectoryPath: String,
         scheme: String,
@@ -133,43 +83,6 @@ struct XcodeTools {
         }.value
     }
 
-    func dumpSdk(
-        projectDirectoryPath: String,
-        module: String,
-        outputFilePath: String
-    ) {
-        let sdkDumpInputPath = "\(Constants.derivedDataPath)/Build/Products/Debug-iphonesimulator"
-        
-        let command = [
-            "cd \(projectDirectoryPath);",
-            "xcrun swift-api-digester -dump-sdk",
-            "-module \(module)",
-            "-I \(sdkDumpInputPath)",
-            "-o \(outputFilePath)",
-            iOSTarget,
-            "-abort-on-module-fail"
-        ]
-        
-        // print("👾 \(command.joined(separator: " "))")
-        shell.execute(command.joined(separator: " "))
-    }
-    
-    func diagnoseSdk(
-        oldAbiJsonFilePath: String,
-        newAbiJsonFilePath: String,
-        module: String
-    ) -> String {
-        
-        let command = [
-            "xcrun --sdk iphoneos swift-api-digester -diagnose-sdk",
-            "-module \(module)",
-            "-input-paths \(oldAbiJsonFilePath)",
-            "-input-paths \(newAbiJsonFilePath)"
-        ]
-        
-        return shell.execute(command.joined(separator: " "))
-    }
-    
     private var iOSTarget: String {
         "-sdk `\(Constants.simulatorSdkCommand)` -target \(Constants.deviceTarget)"
     }

Sources/Pipeline/Modules/ABIGenerator/ABIGenerator.swift

@@ -8,8 +8,10 @@ import Foundation
 
 struct SwiftPackageFileAnalyzer: ProjectAnalyzing {
 
-    let fileHandler: FileHandling
-    let xcodeTools: XcodeTools
+    private let fileHandler: any FileHandling
+    private let xcodeTools: XcodeTools
+    private let shell: any ShellHandling
+    private let logger: (any Logging)?
 
     private enum Constants {
         static let packageFileName = "Package.swift"
@@ -21,10 +23,12 @@ struct SwiftPackageFileAnalyzer: ProjectAnalyzing {
     init(
         fileHandler: FileHandling = FileManager.default,
         shell: ShellHandling = Shell(),
-        logger: Logging?
+        logger: (any Logging)?
     ) {
         self.fileHandler = fileHandler
         self.xcodeTools = XcodeTools(shell: shell, fileHandler: fileHandler, logger: logger)
+        self.logger = logger
+        self.shell = shell
     }
 
     func analyze(oldProjectUrl: URL, newProjectUrl: URL) throws -> ProjectAnalyzerResult {
@@ -38,7 +42,8 @@ struct SwiftPackageFileAnalyzer: ProjectAnalyzing {
         if fileHandler.fileExists(atPath: oldPackagePath), fileHandler.fileExists(atPath: newPackagePath) {
             let packageHelper = SwiftPackageFileHelper(
                 fileHandler: fileHandler,
-                xcodeTools: xcodeTools
+                shell: shell,
+                logger: logger
             )
 
             return try analyze(