fix(apple): fix iOS vendor

MarathonLabs · Feb 17, 2024 · 07a5883 · 07a5883
1 parent 48adc9a
commit 07a5883
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 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
@@ -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/...pple/base/src/main/kotlin/com/malinskiy/marathon/apple/bin/xcrun/xcodebuild/Xcodebuild.kt b/...pple/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/...ple/base/src/main/kotlin/com/malinskiy/marathon/apple/cmd/remote/rsync/RsyncFileBridge.kt b/...ple/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 {