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( private val configuration: Configuration, - private val vendorConfiguration: VendorConfiguration.MacosConfiguration, + private val vendorConfiguration: VendorConfiguration, private val testBundleIdentifier: AppleTestBundleIdentifier, private val applicationInstaller: AppleApplicationInstaller, ) : RemoteTestParser, 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 {