Remove unused outputDirectory arg and misc. warnings.

Signed-off-by: furby™ <[email protected]>
wabiverse · Nov 26, 2024 · 08d6cf2 · 08d6cf2
1 parent a42e29f
commit 08d6cf2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/Sources/schema-gen/SchemaGenerator.swift b/Sources/schema-gen/SchemaGenerator.swift
@@ -2,7 +2,7 @@ import Foundation
 import SwiftParser
 import SwiftSyntax
 
-extension FileHandle: TextOutputStream {
+extension FileHandle: Swift.TextOutputStream {
   public func write(_ string: String) {
     let data = Data(string.utf8)
     self.write(data)

diff --git a/Sources/swift-bundler/Bundler/SwiftPackageManager/SwiftPackageManager.swift b/Sources/swift-bundler/Bundler/SwiftPackageManager/SwiftPackageManager.swift
@@ -88,7 +88,6 @@ enum SwiftPackageManager {
     architectures: [BuildArchitecture],
     platform: Platform,
     platformVersion: String,
-    outputDirectory: URL,
     hotReloadingEnabled: Bool = false
   ) -> Result<Void, SwiftPackageManagerError> {
     log.info("Starting \(configuration.rawValue) build")
@@ -118,7 +117,7 @@ enum SwiftPackageManager {
             directory: packageDirectory,
             runSilentlyWhenNotVerbose: false
           )
-        case .failure(let error):
+        case .failure(_):
           #if os(macOS)
             let helpMsg = "brew install xcbeautify"
           #else
@@ -184,7 +183,6 @@ enum SwiftPackageManager {
     architectures: [BuildArchitecture],
     platform: Platform,
     platformVersion: String,
-    outputDirectory: URL,
     hotReloadingEnabled: Bool = false
   ) -> Result<URL, SwiftPackageManagerError> {
     #if os(macOS)
@@ -214,7 +212,6 @@ enum SwiftPackageManager {
         architectures: architectures,
         platform: platform,
         platformVersion: platformVersion,
-        outputDirectory: outputDirectory,
         hotReloadingEnabled: hotReloadingEnabled
       ).flatMap { _ in
         let buildPlanFile = scratchDirectory.appendingPathComponent("\(configuration).yaml")

diff --git a/Sources/swift-bundler/Bundler/XcodeBuildManager/XcodeBuildManager.swift b/Sources/swift-bundler/Bundler/XcodeBuildManager/XcodeBuildManager.swift
@@ -25,7 +25,6 @@ enum XcodeBuildManager {
     architectures: [BuildArchitecture],
     platform: Platform,
     platformVersion: String,
-    outputDirectory: URL,
     hotReloadingEnabled: Bool = false
   ) -> Result<Void, XcodeBuildManagerError> {
     log.info("Starting \(configuration.rawValue) build")
@@ -46,7 +45,7 @@ enum XcodeBuildManager {
           directory: packageDirectory,
           runSilentlyWhenNotVerbose: false
         )
-      case .failure(let error):
+      case .failure(_):
         #if os(macOS)
           let helpMsg = "brew install xcbeautify"
         #else
@@ -58,7 +57,7 @@ enum XcodeBuildManager {
         """)
     }
 
-    let archString = architectures.flatMap({ $0.rawValue }).joined(separator: "_")
+    let archString = architectures.compactMap({ $0.rawValue }).joined(separator: "_")
 
     var additionalArgs: [String] = []
     if platform != .macOS {
@@ -130,8 +129,7 @@ enum XcodeBuildManager {
         "-scheme", product,
         "-configuration", configuration.rawValue.capitalized,
         "-usePackageSupportBuiltinSCM",
-        "-derivedDataPath", packageDirectory.appendingPathComponent(".build/\(archString)-apple-\(platform.sdkName)").path,
-        "-archivePath", outputDirectory.appendingPathComponent(product).path
+        "-derivedDataPath", packageDirectory.appendingPathComponent(".build/\(archString)-apple-\(platform.sdkName)").path
       ] + additionalArgs,
       directory: packageDirectory,
       runSilentlyWhenNotVerbose: false

diff --git a/Sources/swift-bundler/Commands/BundleCommand.swift b/Sources/swift-bundler/Commands/BundleCommand.swift
@@ -246,7 +246,7 @@ struct BundleCommand: AsyncCommand {
             platformVersion: platformVersion
           ).unwrap()
       } else {
-        let archString = architectures.flatMap({ $0.rawValue }).joined(separator: "_")
+        let archString = architectures.compactMap({ $0.rawValue }).joined(separator: "_")
         // for some reason xcodebuild adds a platform suffix like Release-xrsimulator for visionOS
         // however; for macOS there is no platform suffix at all.
         let platformSuffix = arguments.platform == .macOS ? "" : "-\(arguments.platform.sdkName)"
@@ -266,7 +266,6 @@ struct BundleCommand: AsyncCommand {
             architectures: architectures,
             platform: arguments.platform,
             platformVersion: platformVersion,
-            outputDirectory: outputDirectory,
             hotReloadingEnabled: hotReloadingEnabled
           ).mapError { error in
             return error
@@ -280,7 +279,6 @@ struct BundleCommand: AsyncCommand {
             architectures: architectures,
             platform: arguments.platform,
             platformVersion: platformVersion,
-            outputDirectory: outputDirectory,
             hotReloadingEnabled: hotReloadingEnabled
           ).mapError { error in
             return error

diff --git a/Sources/swift-bundler/Commands/RunCommand.swift b/Sources/swift-bundler/Commands/RunCommand.swift
@@ -171,7 +171,6 @@ struct RunCommand: AsyncCommand {
                   architectures: architectures,
                   platform: arguments.platform,
                   platformVersion: platformVersion,
-                  outputDirectory: bundle,
                   hotReloadingEnabled: true
                 ).unwrap()
                 log.info("Successfully built dylib")