Fix resource bundles failing to copy with xcodebuilt products.

Signed-off-by: furby™ <[email protected]>
wabiverse · Nov 30, 2024 · 71cd250 · 71cd250
1 parent 73fe891
commit 71cd250
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Sources/swift-bundler/Commands/AsyncCommand.swift b/Sources/swift-bundler/Commands/AsyncCommand.swift
@@ -7,15 +7,15 @@ protocol AsyncCommand: AsyncParsableCommand {
   func wrappedValidate() throws
 
   /// Implement this instead of `run()` to get custom Swift Bundler error handling.
-  func wrappedRun() async throws
+  mutating func wrappedRun() async throws
 }
 
 extension AsyncCommand {
   func wrappedValidate() {}
 }
 
 extension AsyncCommand {
-  func run() async {
+  mutating func run() async {
     do {
       try await wrappedRun()
     } catch {

diff --git a/Sources/swift-bundler/Commands/BundleCommand.swift b/Sources/swift-bundler/Commands/BundleCommand.swift
@@ -187,7 +187,7 @@ struct BundleCommand: AsyncCommand {
     return architectures
   }
 
-  func wrappedRun() async throws {
+  mutating func wrappedRun() async throws {
     _ = try await doBundling()
   }
 
@@ -196,7 +196,7 @@ struct BundleCommand: AsyncCommand {
   ///   `RunCommand` to figure out where the output bundle will end up even
   ///   when the user instructs it to skip bundling.
   /// - Returns: A description of the structure of the bundler's output.
-  func doBundling(dryRun: Bool = false) async throws -> BundlerOutputStructure {
+  mutating func doBundling(dryRun: Bool = false) async throws -> BundlerOutputStructure {
     // Time execution so that we can report it to the user.
     let (elapsed, bundlerOutputStructure) = try await Stopwatch.time {
       // Load configuration
@@ -231,6 +231,9 @@ struct BundleCommand: AsyncCommand {
       forceUsingXcodeBuild = arguments.noXcodebuild ? !arguments.noXcodebuild : forceUsingXcodeBuild
 
       if forceUsingXcodeBuild {
+        // If building with xcodebuild, be sure to set that here.
+        self.builtWithXcode = true
+
         // Terminate the program if the project is an Xcodeproj based project.
         let xcodeprojs = try FileManager.default.contentsOfDirectory(
           at: packageDirectory,

diff --git a/Sources/swift-bundler/Commands/RunCommand.swift b/Sources/swift-bundler/Commands/RunCommand.swift
@@ -89,7 +89,7 @@ struct RunCommand: AsyncCommand {
       simulatorSearchTerm: simulatorSearchTerm
     )
 
-    let bundleCommand = BundleCommand(
+    var bundleCommand = BundleCommand(
       arguments: _arguments,
       skipBuild: false,
       builtWithXcode: false,