From 07a5883eaf4725dc65214a0735bdce98307d43a2 Mon Sep 17 00:00:00 2001
From: Anton Malinskiy <anton@malinskiy.com>
Date: Sat, 17 Feb 2024 22:45:15 +1000
Subject: [PATCH] fix(apple): fix iOS vendor

---
 .../main/kotlin/com/malinskiy/marathon/apple/XCTestParser.kt    | 2 +-
 .../malinskiy/marathon/apple/bin/xcrun/xcodebuild/Xcodebuild.kt | 2 +-
 .../marathon/apple/cmd/remote/rsync/RsyncFileBridge.kt          | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/XCTestParser.kt b/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/XCTestParser.kt
index c8eab8362..bb4d18cc4 100644
--- a/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/XCTestParser.kt
+++ b/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/XCTestParser.kt
@@ -22,7 +22,7 @@ import kotlin.io.path.outputStream
 
 class XCTestParser<T: AppleDevice>(
     private val configuration: Configuration,
-    private val vendorConfiguration: VendorConfiguration.MacosConfiguration,
+    private val vendorConfiguration: VendorConfiguration,
     private val testBundleIdentifier: AppleTestBundleIdentifier,
     private val applicationInstaller: AppleApplicationInstaller<T>,
 ) : RemoteTestParser<DeviceProvider>, LineListener {
diff --git a/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/bin/xcrun/xcodebuild/Xcodebuild.kt b/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/bin/xcrun/xcodebuild/Xcodebuild.kt
index 89bdcbbfb..7cbad152f 100644
--- a/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/bin/xcrun/xcodebuild/Xcodebuild.kt
+++ b/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/bin/xcrun/xcodebuild/Xcodebuild.kt
@@ -27,7 +27,7 @@ class Xcodebuild(
             put("-enableCodeCoverage", codeCoverageFlag(request))
             request.xcresult?.let { put("-resultBundlePath", it) }
             put("-destination-timeout", timeoutConfiguration.testDestination.seconds.toString())
-            put("-destination", "\'platform=${sdk.destination},arch=arm64,id=$udid\'")
+            put("-destination", "\'platform=${sdk.destination},id=$udid\'")
         }
             .filterKeys { it != "-xctestrun" }
             .toList()
diff --git a/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/cmd/remote/rsync/RsyncFileBridge.kt b/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/cmd/remote/rsync/RsyncFileBridge.kt
index 57a7179ff..dc882b4ff 100644
--- a/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/cmd/remote/rsync/RsyncFileBridge.kt
+++ b/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/cmd/remote/rsync/RsyncFileBridge.kt
@@ -158,6 +158,7 @@ private fun RSync.a(): RSync {
         .owner(true)
         .devices(true)
         .specials(true)
+        .delete(true) //Cleans up previous runs when sharing paths
 }
 
 private fun File.isDescendantOf(dir: File): Boolean {