diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts index e81ddaeb5..03289e496 100644 --- a/cli/build.gradle.kts +++ b/cli/build.gradle.kts @@ -34,7 +34,7 @@ distributions { dependencies { implementation(project(":core")) - implementation(project(":vendor:vendor-ios")) + implementation(project(":vendor:vendor-apple:ios")) implementation(project(":vendor:vendor-android")) implementation(project(":analytics:usage")) implementation(Libraries.kotlinStdLib) diff --git a/cli/src/main/kotlin/com/malinskiy/marathon/cli/ApplicationView.kt b/cli/src/main/kotlin/com/malinskiy/marathon/cli/ApplicationView.kt index 0c1ec0170..7f6adc2dc 100644 --- a/cli/src/main/kotlin/com/malinskiy/marathon/cli/ApplicationView.kt +++ b/cli/src/main/kotlin/com/malinskiy/marathon/cli/ApplicationView.kt @@ -20,7 +20,7 @@ import com.malinskiy.marathon.config.serialization.ConfigurationFactory import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.di.marathonStartKoin import com.malinskiy.marathon.exceptions.ExceptionsReporterFactory -import com.malinskiy.marathon.ios.AppleVendor +import com.malinskiy.marathon.apple.ios.AppleVendor import com.malinskiy.marathon.log.MarathonLogging import org.koin.core.context.stopKoin import org.koin.dsl.module diff --git a/settings.gradle.kts b/settings.gradle.kts index dc720e808..2705b01a6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,8 @@ rootProject.name = "marathon" include("core") include("configuration") include("vendor:vendor-android") -include("vendor:vendor-ios") +include("vendor:vendor-apple:ios") +include("vendor:vendor-apple:base") include("vendor:vendor-test") include("marathon-gradle-plugin") include("report:html-report") diff --git a/vendor/vendor-apple/base/build.gradle.kts b/vendor/vendor-apple/base/build.gradle.kts new file mode 100644 index 000000000..6ca0e793f --- /dev/null +++ b/vendor/vendor-apple/base/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + `java-library` + jacoco + id("org.jetbrains.kotlin.jvm") + id("org.jetbrains.dokka") +} + +dependencies { + api(Libraries.sshj) +} + +setupDeployment() +setupKotlinCompiler() +setupTestTask() diff --git a/vendor/vendor-ios/src/main/kotlin/net/schmizz/sshj/PatchedSSHClient.kt b/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/sshj/PatchedSSHClient.kt similarity index 68% rename from vendor/vendor-ios/src/main/kotlin/net/schmizz/sshj/PatchedSSHClient.kt rename to vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/sshj/PatchedSSHClient.kt index 7e3482066..b95a235c5 100644 --- a/vendor/vendor-ios/src/main/kotlin/net/schmizz/sshj/PatchedSSHClient.kt +++ b/vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/sshj/PatchedSSHClient.kt @@ -1,13 +1,15 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package net.schmizz.sshj +package com.malinskiy.marathon.apple.sshj -import net.schmizz.sshj.connection.channel.direct.PatchedExecChannel +import net.schmizz.sshj.Config +import net.schmizz.sshj.SSHClient +import sshj.connection.channel.direct.PatchedExecChannel import net.schmizz.sshj.connection.channel.direct.Session /** * Subclass of SSHJ [SSHClient] that uses [PatchedSSHClient] which handles some strange features. */ -internal class PatchedSSHClient(config: Config) : SSHClient(config) { +class PatchedSSHClient(config: Config) : SSHClient(config) { override fun startSession(): Session { check(isConnected) { "Not connected" } check(isAuthenticated) { "Not authenticated" } diff --git a/vendor/vendor-ios/src/main/kotlin/net/schmizz/sshj/connection/channel/direct/PatchedExecChannel.kt b/vendor/vendor-apple/base/src/main/kotlin/sshj/connection/channel/direct/PatchedExecChannel.kt similarity index 95% rename from vendor/vendor-ios/src/main/kotlin/net/schmizz/sshj/connection/channel/direct/PatchedExecChannel.kt rename to vendor/vendor-apple/base/src/main/kotlin/sshj/connection/channel/direct/PatchedExecChannel.kt index 964ca6b13..e4484c55b 100644 --- a/vendor/vendor-ios/src/main/kotlin/net/schmizz/sshj/connection/channel/direct/PatchedExecChannel.kt +++ b/vendor/vendor-apple/base/src/main/kotlin/sshj/connection/channel/direct/PatchedExecChannel.kt @@ -1,5 +1,5 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package net.schmizz.sshj.connection.channel.direct +package sshj.connection.channel.direct import net.schmizz.sshj.SSHClient import net.schmizz.sshj.common.Buffer @@ -7,6 +7,7 @@ import net.schmizz.sshj.common.DisconnectReason import net.schmizz.sshj.common.SSHPacket import net.schmizz.sshj.connection.ConnectionException import net.schmizz.sshj.connection.channel.ChannelInputStream +import net.schmizz.sshj.connection.channel.direct.SessionChannel /** * Subclass of SSHJ [SessionChannel] that handles some strange features. diff --git a/vendor/vendor-ios/build.gradle.kts b/vendor/vendor-apple/ios/build.gradle.kts similarity index 96% rename from vendor/vendor-ios/build.gradle.kts rename to vendor/vendor-apple/ios/build.gradle.kts index 73686d196..f2ac417ac 100644 --- a/vendor/vendor-ios/build.gradle.kts +++ b/vendor/vendor-apple/ios/build.gradle.kts @@ -18,13 +18,14 @@ dependencies { implementation(Libraries.ddPlist) implementation(Libraries.guava) implementation(Libraries.rsync4j) - implementation(Libraries.sshj) + implementation(Libraries.gson) implementation(Libraries.jacksonKotlin) implementation(Libraries.jacksonYaml) implementation(Libraries.jansi) implementation(Libraries.kotlinProcess) implementation(project(":core")) + implementation(project(":vendor:vendor-apple:base")) testImplementation(TestLibraries.kluent) testImplementation(TestLibraries.assertk) testImplementation(TestLibraries.mockitoKotlin) diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleApplicationInstaller.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleApplicationInstaller.kt similarity index 96% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleApplicationInstaller.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleApplicationInstaller.kt index d8fe3f21c..c20de2d8a 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleApplicationInstaller.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleApplicationInstaller.kt @@ -1,14 +1,14 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios +import com.malinskiy.marathon.apple.ios.extensions.testBundle +import com.malinskiy.marathon.apple.ios.model.Sdk +import com.malinskiy.marathon.apple.ios.xctestrun.TestRootFactory import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.exceptions.ConfigurationException import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.config.vendor.ios.TestType import com.malinskiy.marathon.exceptions.DeviceSetupException import com.malinskiy.marathon.execution.withRetry -import com.malinskiy.marathon.ios.extensions.testBundle -import com.malinskiy.marathon.ios.model.Sdk -import com.malinskiy.marathon.ios.xctestrun.TestRootFactory import com.malinskiy.marathon.log.MarathonLogging class AppleApplicationInstaller( diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDevice.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDevice.kt similarity index 86% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDevice.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDevice.kt index c9ac4ef71..02716f257 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDevice.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDevice.kt @@ -1,11 +1,11 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios +import com.malinskiy.marathon.apple.ios.cmd.CommandResult +import com.malinskiy.marathon.apple.ios.test.TestEvent +import com.malinskiy.marathon.apple.ios.test.TestRequest import com.malinskiy.marathon.device.Device import com.malinskiy.marathon.device.screenshot.Screenshottable import com.malinskiy.marathon.exceptions.DeviceSetupException -import com.malinskiy.marathon.ios.cmd.CommandResult -import com.malinskiy.marathon.ios.test.TestEvent -import com.malinskiy.marathon.ios.test.TestRequest import com.malinskiy.marathon.report.logs.LogProducer import kotlinx.coroutines.channels.ReceiveChannel import java.io.File diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDeviceProvider.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDeviceProvider.kt similarity index 89% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDeviceProvider.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDeviceProvider.kt index fdce148f4..50050181b 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDeviceProvider.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDeviceProvider.kt @@ -1,21 +1,21 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios import com.fasterxml.jackson.databind.JsonMappingException import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import com.google.gson.Gson import com.malinskiy.marathon.analytics.internal.pub.Track +import com.malinskiy.marathon.apple.ios.configuration.AppleTarget +import com.malinskiy.marathon.apple.ios.configuration.Marathondevices +import com.malinskiy.marathon.apple.ios.configuration.Transport +import com.malinskiy.marathon.apple.ios.configuration.Worker +import com.malinskiy.marathon.apple.ios.device.AppleSimulatorProvider +import com.malinskiy.marathon.apple.ios.device.SimulatorFactory import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.device.Device import com.malinskiy.marathon.device.DeviceProvider import com.malinskiy.marathon.exceptions.NoDevicesException -import com.malinskiy.marathon.ios.configuration.AppleTarget -import com.malinskiy.marathon.ios.configuration.Marathondevices -import com.malinskiy.marathon.ios.configuration.Transport -import com.malinskiy.marathon.ios.configuration.Worker -import com.malinskiy.marathon.ios.device.AppleSimulatorProvider -import com.malinskiy.marathon.ios.device.SimulatorFactory import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.time.Timer import kotlinx.coroutines.CoroutineScope diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDeviceTestRunner.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDeviceTestRunner.kt similarity index 82% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDeviceTestRunner.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDeviceTestRunner.kt index f7ee17561..ede1cbe1d 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDeviceTestRunner.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDeviceTestRunner.kt @@ -1,18 +1,18 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios +import com.malinskiy.marathon.apple.ios.extensions.testBundle +import com.malinskiy.marathon.apple.ios.listener.AppleTestRunListener +import com.malinskiy.marathon.apple.ios.test.TestEvent +import com.malinskiy.marathon.apple.ios.test.TestFailed +import com.malinskiy.marathon.apple.ios.test.TestIgnored +import com.malinskiy.marathon.apple.ios.test.TestPassed +import com.malinskiy.marathon.apple.ios.test.TestRequest +import com.malinskiy.marathon.apple.ios.test.TestRunEnded +import com.malinskiy.marathon.apple.ios.test.TestRunFailed +import com.malinskiy.marathon.apple.ios.test.TestRunStartedEvent +import com.malinskiy.marathon.apple.ios.test.TestStarted import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.vendor.VendorConfiguration -import com.malinskiy.marathon.ios.executor.listener.AppleTestRunListener -import com.malinskiy.marathon.ios.extensions.testBundle -import com.malinskiy.marathon.ios.test.TestEvent -import com.malinskiy.marathon.ios.test.TestPassed -import com.malinskiy.marathon.ios.test.TestFailed -import com.malinskiy.marathon.ios.test.TestIgnored -import com.malinskiy.marathon.ios.test.TestRequest -import com.malinskiy.marathon.ios.test.TestRunEnded -import com.malinskiy.marathon.ios.test.TestRunFailed -import com.malinskiy.marathon.ios.test.TestRunStartedEvent -import com.malinskiy.marathon.ios.test.TestStarted import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.test.TestBatch import com.malinskiy.marathon.test.toTestName diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleLogConfigurator.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleLogConfigurator.kt similarity index 98% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleLogConfigurator.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleLogConfigurator.kt index 7bb1355ee..fc351fe3c 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleLogConfigurator.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleLogConfigurator.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios import ch.qos.logback.classic.Level import ch.qos.logback.classic.Logger diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleSimulatorDevice.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleSimulatorDevice.kt similarity index 94% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleSimulatorDevice.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleSimulatorDevice.kt index edcc5a2c1..3d1262960 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleSimulatorDevice.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleSimulatorDevice.kt @@ -1,7 +1,31 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios import com.dd.plist.PropertyListParser import com.malinskiy.marathon.analytics.internal.pub.Track +import com.malinskiy.marathon.apple.ios.bin.AppleBinaryEnvironment +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service.ApplicationService +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandResult +import com.malinskiy.marathon.apple.ios.cmd.FileBridge +import com.malinskiy.marathon.apple.ios.listener.AppleTestRunListener +import com.malinskiy.marathon.apple.ios.listener.CompositeTestRunListener +import com.malinskiy.marathon.apple.ios.listener.DebugTestRunListener +import com.malinskiy.marathon.apple.ios.listener.ResultBundleRunListener +import com.malinskiy.marathon.apple.ios.listener.TestResultsListener +import com.malinskiy.marathon.apple.ios.listener.TestRunListenerAdapter +import com.malinskiy.marathon.apple.ios.listener.screenshot.ScreenCapturerTestRunListener +import com.malinskiy.marathon.apple.ios.listener.video.ScreenRecordingListener +import com.malinskiy.marathon.apple.ios.logparser.XctestEventProducer +import com.malinskiy.marathon.apple.ios.logparser.parser.DebugLogPrinter +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureException +import com.malinskiy.marathon.apple.ios.logparser.parser.DiagnosticLogsPathFinder +import com.malinskiy.marathon.apple.ios.logparser.parser.SessionResultsPathFinder +import com.malinskiy.marathon.apple.ios.model.Arch +import com.malinskiy.marathon.apple.ios.model.Sdk +import com.malinskiy.marathon.apple.ios.model.Simulator +import com.malinskiy.marathon.apple.ios.model.XcodeVersion +import com.malinskiy.marathon.apple.ios.test.TestEvent +import com.malinskiy.marathon.apple.ios.test.TestRequest import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.ScreenRecordingPolicy import com.malinskiy.marathon.config.vendor.VendorConfiguration @@ -21,30 +45,6 @@ import com.malinskiy.marathon.execution.TestBatchResults import com.malinskiy.marathon.execution.listener.LineListener import com.malinskiy.marathon.execution.listener.LogListener import com.malinskiy.marathon.io.FileManager -import com.malinskiy.marathon.ios.bin.AppleBinaryEnvironment -import com.malinskiy.marathon.ios.bin.xcrun.simctl.service.ApplicationService -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult -import com.malinskiy.marathon.ios.cmd.FileBridge -import com.malinskiy.marathon.ios.executor.listener.AppleTestRunListener -import com.malinskiy.marathon.ios.executor.listener.CompositeTestRunListener -import com.malinskiy.marathon.ios.executor.listener.DebugTestRunListener -import com.malinskiy.marathon.ios.executor.listener.ResultBundleRunListener -import com.malinskiy.marathon.ios.executor.listener.video.ScreenRecordingListener -import com.malinskiy.marathon.ios.executor.listener.TestResultsListener -import com.malinskiy.marathon.ios.executor.listener.TestRunListenerAdapter -import com.malinskiy.marathon.ios.executor.listener.screenshot.ScreenCapturerTestRunListener -import com.malinskiy.marathon.ios.logparser.XctestEventProducer -import com.malinskiy.marathon.ios.logparser.parser.DebugLogPrinter -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureException -import com.malinskiy.marathon.ios.logparser.parser.DiagnosticLogsPathFinder -import com.malinskiy.marathon.ios.logparser.parser.SessionResultsPathFinder -import com.malinskiy.marathon.ios.model.Arch -import com.malinskiy.marathon.ios.model.Sdk -import com.malinskiy.marathon.ios.model.Simulator -import com.malinskiy.marathon.ios.model.XcodeVersion -import com.malinskiy.marathon.ios.test.TestEvent -import com.malinskiy.marathon.ios.test.TestRequest import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.report.attachment.AttachmentProvider import com.malinskiy.marathon.report.logs.LogWriter diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleTestBundleIdentifier.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleTestBundleIdentifier.kt similarity index 86% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleTestBundleIdentifier.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleTestBundleIdentifier.kt index e989e226c..4202bf8a3 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleTestBundleIdentifier.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleTestBundleIdentifier.kt @@ -1,11 +1,10 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios +import com.malinskiy.marathon.apple.ios.model.AppleTestBundle import com.malinskiy.marathon.config.exceptions.ConfigurationException import com.malinskiy.marathon.execution.bundle.TestBundleIdentifier -import com.malinskiy.marathon.ios.model.AppleTestBundle import com.malinskiy.marathon.test.Test import com.malinskiy.marathon.test.toTestName -import java.io.File import java.util.concurrent.ConcurrentHashMap class AppleTestBundleIdentifier : TestBundleIdentifier { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleVendor.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleVendor.kt similarity index 93% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleVendor.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleVendor.kt index 3b9a7a176..4708e3a3f 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleVendor.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleVendor.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory @@ -6,14 +6,14 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator import com.fasterxml.jackson.module.kotlin.KotlinFeature import com.fasterxml.jackson.module.kotlin.KotlinModule import com.google.gson.GsonBuilder +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlDeviceList +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlDeviceListDeserializer import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.config.vendor.ios.TestParserConfiguration import com.malinskiy.marathon.device.DeviceProvider import com.malinskiy.marathon.execution.TestParser import com.malinskiy.marathon.execution.bundle.TestBundleIdentifier -import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlDeviceList -import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlDeviceListDeserializer import com.malinskiy.marathon.log.MarathonLogConfigurator import org.koin.dsl.module diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/NmTestParser.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/NmTestParser.kt similarity index 96% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/NmTestParser.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/NmTestParser.kt index 78d3f50f0..77d541acc 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/NmTestParser.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/NmTestParser.kt @@ -1,5 +1,7 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios +import com.malinskiy.marathon.apple.ios.extensions.testBundle +import com.malinskiy.marathon.apple.ios.model.AppleTestBundle import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.exceptions.ConfigurationException import com.malinskiy.marathon.config.vendor.VendorConfiguration @@ -8,8 +10,6 @@ import com.malinskiy.marathon.device.Device import com.malinskiy.marathon.exceptions.TestParsingException import com.malinskiy.marathon.execution.RemoteTestParser import com.malinskiy.marathon.execution.withRetry -import com.malinskiy.marathon.ios.extensions.testBundle -import com.malinskiy.marathon.ios.model.AppleTestBundle import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.test.Test import kotlinx.coroutines.CancellationException diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/RecorderTypeSelector.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/RecorderTypeSelector.kt similarity index 97% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/RecorderTypeSelector.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/RecorderTypeSelector.kt index 3e83cb8eb..d72885b10 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/RecorderTypeSelector.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/RecorderTypeSelector.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios import com.malinskiy.marathon.config.vendor.ios.RecorderType import com.malinskiy.marathon.config.vendor.ios.ScreenRecordConfiguration diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/RemoteFileManager.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/RemoteFileManager.kt similarity index 97% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/RemoteFileManager.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/RemoteFileManager.kt index 8b9e488aa..a928c3b9f 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/RemoteFileManager.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/RemoteFileManager.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios +import com.malinskiy.marathon.apple.ios.RemoteFileManager.Companion.FILE_SEPARATOR import com.malinskiy.marathon.config.vendor.ios.Type import com.malinskiy.marathon.extension.escape -import com.malinskiy.marathon.ios.RemoteFileManager.Companion.FILE_SEPARATOR import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.test.Test import com.malinskiy.marathon.test.TestBatch diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/XCTestParser.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/XCTestParser.kt similarity index 94% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/XCTestParser.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/XCTestParser.kt index c0fe8dd4b..744c71ccd 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/XCTestParser.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/XCTestParser.kt @@ -1,5 +1,10 @@ -package com.malinskiy.marathon.ios +package com.malinskiy.marathon.apple.ios +import com.malinskiy.marathon.apple.ios.extensions.testBundle +import com.malinskiy.marathon.apple.ios.model.AppleTestBundle +import com.malinskiy.marathon.apple.ios.test.TestEvent +import com.malinskiy.marathon.apple.ios.test.TestRequest +import com.malinskiy.marathon.apple.ios.test.TestStarted import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.exceptions.ConfigurationException import com.malinskiy.marathon.config.vendor.VendorConfiguration @@ -8,11 +13,6 @@ import com.malinskiy.marathon.exceptions.TestParsingException import com.malinskiy.marathon.execution.RemoteTestParser import com.malinskiy.marathon.execution.listener.LineListener import com.malinskiy.marathon.execution.withRetry -import com.malinskiy.marathon.ios.extensions.testBundle -import com.malinskiy.marathon.ios.model.AppleTestBundle -import com.malinskiy.marathon.ios.test.TestEvent -import com.malinskiy.marathon.ios.test.TestRequest -import com.malinskiy.marathon.ios.test.TestStarted import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.test.Test import kotlinx.coroutines.CancellationException diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/AppleBinaryEnvironment.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/AppleBinaryEnvironment.kt similarity index 64% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/AppleBinaryEnvironment.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/AppleBinaryEnvironment.kt index 0731fa584..d3444a3bd 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/AppleBinaryEnvironment.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/AppleBinaryEnvironment.kt @@ -1,16 +1,16 @@ -package com.malinskiy.marathon.ios.bin +package com.malinskiy.marathon.apple.ios.bin import com.google.gson.Gson +import com.malinskiy.marathon.apple.ios.bin.codesign.Codesign +import com.malinskiy.marathon.apple.ios.bin.getconf.Getconf +import com.malinskiy.marathon.apple.ios.bin.lipo.Lipo +import com.malinskiy.marathon.apple.ios.bin.nm.Nm +import com.malinskiy.marathon.apple.ios.bin.plistbuddy.PlistBuddy +import com.malinskiy.marathon.apple.ios.bin.xcodeselect.Xcodeselect +import com.malinskiy.marathon.apple.ios.bin.xcrun.Xcrun +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.vendor.VendorConfiguration -import com.malinskiy.marathon.ios.bin.codesign.Codesign -import com.malinskiy.marathon.ios.bin.getconf.Getconf -import com.malinskiy.marathon.ios.bin.lipo.Lipo -import com.malinskiy.marathon.ios.bin.nm.Nm -import com.malinskiy.marathon.ios.bin.plistbuddy.PlistBuddy -import com.malinskiy.marathon.ios.bin.xcodeselect.Xcodeselect -import com.malinskiy.marathon.ios.bin.xcrun.Xcrun -import com.malinskiy.marathon.ios.cmd.CommandExecutor class AppleBinaryEnvironment( commandExecutor: CommandExecutor, diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/codesign/Codesign.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/codesign/Codesign.kt similarity index 92% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/codesign/Codesign.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/codesign/Codesign.kt index 243af378e..9edd918fc 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/codesign/Codesign.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/codesign/Codesign.kt @@ -1,9 +1,9 @@ -package com.malinskiy.marathon.ios.bin.codesign +package com.malinskiy.marathon.apple.ios.bin.codesign +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandResult import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration import com.malinskiy.marathon.exceptions.DeviceSetupException -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult import java.time.Duration /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/getconf/Getconf.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/getconf/Getconf.kt similarity index 82% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/getconf/Getconf.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/getconf/Getconf.kt index 49fb4fc8a..f84c48512 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/getconf/Getconf.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/getconf/Getconf.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.bin.getconf +package com.malinskiy.marathon.apple.ios.bin.getconf +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.ios.cmd.CommandExecutor /** * retrieve standard configuration variables diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/lipo/Lipo.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/lipo/Lipo.kt similarity index 85% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/lipo/Lipo.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/lipo/Lipo.kt index 903191eab..92f665d4f 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/lipo/Lipo.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/lipo/Lipo.kt @@ -1,10 +1,10 @@ -package com.malinskiy.marathon.ios.bin.lipo +package com.malinskiy.marathon.apple.ios.bin.lipo +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandResult +import com.malinskiy.marathon.apple.ios.model.Arch import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration import com.malinskiy.marathon.exceptions.DeviceSetupException -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult -import com.malinskiy.marathon.ios.model.Arch import java.time.Duration /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/nm/Nm.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/nm/Nm.kt similarity index 93% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/nm/Nm.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/nm/Nm.kt index 0e32a8912..719fb4c51 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/nm/Nm.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/nm/Nm.kt @@ -1,9 +1,9 @@ -package com.malinskiy.marathon.ios.bin.nm +package com.malinskiy.marathon.apple.ios.bin.nm +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandResult import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration import com.malinskiy.marathon.exceptions.DeviceSetupException -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult import com.malinskiy.marathon.log.MarathonLogging import java.time.Duration diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/plistbuddy/PlistBuddy.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/plistbuddy/PlistBuddy.kt similarity index 74% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/plistbuddy/PlistBuddy.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/plistbuddy/PlistBuddy.kt index faa1e1dbc..a9557a320 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/plistbuddy/PlistBuddy.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/plistbuddy/PlistBuddy.kt @@ -1,11 +1,8 @@ -package com.malinskiy.marathon.ios.bin.plistbuddy +package com.malinskiy.marathon.apple.ios.bin.plistbuddy +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandResult import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.exceptions.DeviceSetupException -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult -import com.malinskiy.marathon.ios.model.Arch -import java.time.Duration /** * read and write values to plists diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcodeselect/Xcodeselect.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcodeselect/Xcodeselect.kt similarity index 80% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcodeselect/Xcodeselect.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcodeselect/Xcodeselect.kt index 7293141b5..5974b87d0 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcodeselect/Xcodeselect.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcodeselect/Xcodeselect.kt @@ -1,13 +1,8 @@ -package com.malinskiy.marathon.ios.bin.xcodeselect +package com.malinskiy.marathon.apple.ios.bin.xcodeselect +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.model.Sdk import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.exceptions.DeviceSetupException -import com.malinskiy.marathon.ios.RemoteFileManager -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult -import com.malinskiy.marathon.ios.model.Arch -import com.malinskiy.marathon.ios.model.Sdk -import java.time.Duration /** * Manages the active developer directory for Xcode and BSD tools diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/Xcrun.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/Xcrun.kt similarity index 79% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/Xcrun.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/Xcrun.kt index 3b29d094b..cc7c90c6a 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/Xcrun.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/Xcrun.kt @@ -1,13 +1,13 @@ -package com.malinskiy.marathon.ios.bin.xcrun +package com.malinskiy.marathon.apple.ios.bin.xcrun import com.google.gson.Gson +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.Simctl +import com.malinskiy.marathon.apple.ios.bin.xcrun.xcodebuild.Xcodebuild +import com.malinskiy.marathon.apple.ios.bin.xcrun.xcresulttool.Xcresulttool +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.model.Sdk import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.vendor.VendorConfiguration -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.bin.xcrun.simctl.Simctl -import com.malinskiy.marathon.ios.bin.xcrun.xcodebuild.Xcodebuild -import com.malinskiy.marathon.ios.bin.xcrun.xcresulttool.Xcresulttool -import com.malinskiy.marathon.ios.model.Sdk class Xcrun( private val commandExecutor: CommandExecutor, diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/Simctl.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/Simctl.kt similarity index 65% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/Simctl.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/Simctl.kt index 02597dd26..827cd89fe 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/Simctl.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/Simctl.kt @@ -1,15 +1,15 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl import com.google.gson.Gson +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service.ApplicationService +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service.DeviceService +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service.IoService +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service.PrivacyService +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service.SimulatorService +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.ios.bin.xcrun.simctl.service.ApplicationService -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.bin.xcrun.simctl.service.DeviceService -import com.malinskiy.marathon.ios.bin.xcrun.simctl.service.IoService -import com.malinskiy.marathon.ios.bin.xcrun.simctl.service.PrivacyService -import com.malinskiy.marathon.ios.bin.xcrun.simctl.service.SimulatorService import com.malinskiy.marathon.log.MarathonLogging class Simctl( diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/SimctlService.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/SimctlService.kt similarity index 87% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/SimctlService.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/SimctlService.kt index ea53db53b..3cd845aea 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/SimctlService.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/SimctlService.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandResult import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult import java.time.Duration abstract class SimctlService(private val commandExecutor: CommandExecutor) { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlDevice.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlDevice.kt similarity index 94% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlDevice.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlDevice.kt index 6e0c7a8c6..fccbde5d4 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlDevice.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlDevice.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.model +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model import com.google.gson.annotations.SerializedName diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlDeviceList.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlDeviceList.kt similarity index 96% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlDeviceList.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlDeviceList.kt index b94fee047..fe5fc5b04 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlDeviceList.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlDeviceList.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.model +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model import com.google.gson.JsonDeserializationContext import com.google.gson.JsonDeserializer diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlDeviceType.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlDeviceType.kt similarity index 92% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlDeviceType.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlDeviceType.kt index 9f1282af8..74c30a257 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlDeviceType.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlDeviceType.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.model +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model import com.google.gson.annotations.SerializedName diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlListDevicesOutput.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlListDevicesOutput.kt similarity index 77% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlListDevicesOutput.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlListDevicesOutput.kt index 5875e9f44..ff2f18ab4 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlListDevicesOutput.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlListDevicesOutput.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.model +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model data class SimctlListDevicesOutput( val devicetypes: List, diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlRuntime.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlRuntime.kt similarity index 87% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlRuntime.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlRuntime.kt index 038a5836d..24d101650 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/model/SimctlRuntime.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/model/SimctlRuntime.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.model +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model import com.fasterxml.jackson.annotation.JsonProperty diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/ApplicationService.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/ApplicationService.kt similarity index 85% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/ApplicationService.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/ApplicationService.kt index 3acf727b8..15f791c1d 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/ApplicationService.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/ApplicationService.kt @@ -1,9 +1,9 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.service +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.SimctlService +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandResult import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult -import com.malinskiy.marathon.ios.bin.xcrun.simctl.SimctlService class ApplicationService (commandExecutor: CommandExecutor, private val timeoutConfiguration: TimeoutConfiguration, diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/DeviceService.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/DeviceService.kt similarity index 72% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/DeviceService.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/DeviceService.kt index d76a55cd7..51ae8e3da 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/DeviceService.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/DeviceService.kt @@ -1,14 +1,14 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.service +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service import com.google.gson.Gson import com.google.gson.JsonSyntaxException +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.SimctlService +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlDevice +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlListDevicesOutput +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureException +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureException -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason -import com.malinskiy.marathon.ios.bin.xcrun.simctl.SimctlService -import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlDevice -import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlListDevicesOutput import com.malinskiy.marathon.log.MarathonLogging class DeviceService( diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/IoService.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/IoService.kt similarity index 87% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/IoService.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/IoService.kt index a3debb5c9..bbe6bf6a8 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/IoService.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/IoService.kt @@ -1,13 +1,13 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.service +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.SimctlService +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandResult import com.malinskiy.marathon.config.vendor.ios.Codec import com.malinskiy.marathon.config.vendor.ios.Display import com.malinskiy.marathon.config.vendor.ios.Mask import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration import com.malinskiy.marathon.config.vendor.ios.Type -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult -import com.malinskiy.marathon.ios.bin.xcrun.simctl.SimctlService import com.malinskiy.marathon.log.MarathonLogging class IoService( diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/PrivacyService.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/PrivacyService.kt similarity index 87% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/PrivacyService.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/PrivacyService.kt index 9fbca7c2a..7cbc54588 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/PrivacyService.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/PrivacyService.kt @@ -1,10 +1,10 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.service +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.SimctlService +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandResult import com.malinskiy.marathon.config.vendor.ios.Permission import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandResult -import com.malinskiy.marathon.ios.bin.xcrun.simctl.SimctlService class PrivacyService(commandExecutor: CommandExecutor, private val timeoutConfiguration: TimeoutConfiguration, diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/SimulatorService.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/SimulatorService.kt similarity index 96% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/SimulatorService.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/SimulatorService.kt index 9122fefac..743ccad7f 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/simctl/service/SimulatorService.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/simctl/service/SimulatorService.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios.bin.xcrun.simctl.service +package com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.SimctlService +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.bin.xcrun.simctl.SimctlService import com.malinskiy.marathon.log.MarathonLogging class SimulatorService( diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/xcodebuild/Xcodebuild.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/xcodebuild/Xcodebuild.kt similarity index 89% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/xcodebuild/Xcodebuild.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/xcodebuild/Xcodebuild.kt index dc34db76c..1545980a6 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/xcodebuild/Xcodebuild.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/xcodebuild/Xcodebuild.kt @@ -1,12 +1,12 @@ -package com.malinskiy.marathon.ios.bin.xcrun.xcodebuild +package com.malinskiy.marathon.apple.ios.bin.xcrun.xcodebuild +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandSession +import com.malinskiy.marathon.apple.ios.model.XcodeVersion +import com.malinskiy.marathon.apple.ios.test.TestRequest import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandSession -import com.malinskiy.marathon.ios.model.XcodeVersion -import com.malinskiy.marathon.ios.test.TestRequest import com.malinskiy.marathon.log.MarathonLogging import java.time.Duration diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/xcresulttool/AppleJsonTypeAdapterFactory.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/xcresulttool/AppleJsonTypeAdapterFactory.kt similarity index 98% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/xcresulttool/AppleJsonTypeAdapterFactory.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/xcresulttool/AppleJsonTypeAdapterFactory.kt index 04ef0fddb..937daf99c 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/xcresulttool/AppleJsonTypeAdapterFactory.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/xcresulttool/AppleJsonTypeAdapterFactory.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.bin.xcrun.xcresulttool +package com.malinskiy.marathon.apple.ios.bin.xcrun.xcresulttool import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.databind.BeanDescription diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/xcresulttool/Xcresulttool.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/xcresulttool/Xcresulttool.kt similarity index 96% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/xcresulttool/Xcresulttool.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/xcresulttool/Xcresulttool.kt index fae2b5954..f9a3561fe 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/xcrun/xcresulttool/Xcresulttool.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/xcrun/xcresulttool/Xcresulttool.kt @@ -1,12 +1,12 @@ -package com.malinskiy.marathon.ios.bin.xcrun.xcresulttool +package com.malinskiy.marathon.apple.ios.bin.xcrun.xcresulttool import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.KotlinFeature import com.fasterxml.jackson.module.kotlin.KotlinModule import com.google.gson.JsonSyntaxException +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration -import com.malinskiy.marathon.ios.cmd.CommandExecutor import com.malinskiy.marathon.log.MarathonLogging /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommand.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/BaseCommand.kt similarity index 97% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommand.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/BaseCommand.kt index 3b6a35b92..c22e553f6 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommand.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/BaseCommand.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.cmd +package com.malinskiy.marathon.apple.ios.cmd import kotlinx.coroutines.CompletableJob import kotlinx.coroutines.Deferred diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandException.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandException.kt similarity index 76% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandException.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandException.kt index 9687455d7..3f2a4e51f 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandException.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandException.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.cmd +package com.malinskiy.marathon.apple.ios.cmd class CommandException : RuntimeException { constructor(cause: Throwable) : super(cause) diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandExecutor.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandExecutor.kt similarity index 98% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandExecutor.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandExecutor.kt index 4b8597fa8..17f10b2f3 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandExecutor.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandExecutor.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.cmd +package com.malinskiy.marathon.apple.ios.cmd import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration import mu.KLogger diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandHost.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandHost.kt similarity index 69% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandHost.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandHost.kt index 9faa4a962..e93cf045c 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandHost.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandHost.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.cmd +package com.malinskiy.marathon.apple.ios.cmd import java.nio.charset.Charset diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandResult.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandResult.kt similarity index 91% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandResult.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandResult.kt index 8e5ec7141..7b2c364cd 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandResult.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandResult.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.cmd +package com.malinskiy.marathon.apple.ios.cmd data class CommandResult(val stdout: List, val stderr: List, val exitCode: Int?) { val successful = exitCode == 0 diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandSession.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandSession.kt similarity index 89% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandSession.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandSession.kt index 2b6b1c501..a1fe349d8 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/CommandSession.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/CommandSession.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.cmd +package com.malinskiy.marathon.apple.ios.cmd import kotlinx.coroutines.Deferred import kotlinx.coroutines.channels.ReceiveChannel diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/FileBridge.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/FileBridge.kt similarity index 77% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/FileBridge.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/FileBridge.kt index ce951a509..0094d3e18 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/FileBridge.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/FileBridge.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.cmd +package com.malinskiy.marathon.apple.ios.cmd import java.io.File diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/LineBuffer.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/LineBuffer.kt similarity index 97% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/LineBuffer.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/LineBuffer.kt index a20c617c9..4b8ed353a 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/LineBuffer.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/LineBuffer.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.cmd +package com.malinskiy.marathon.apple.ios.cmd import kotlinx.coroutines.runBlocking import java.io.Closeable diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/JvmFileBridge.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/JvmFileBridge.kt similarity index 78% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/JvmFileBridge.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/JvmFileBridge.kt index b451d5fe8..1dcf9ea4f 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/JvmFileBridge.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/JvmFileBridge.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.cmd.local +package com.malinskiy.marathon.apple.ios.cmd.local -import com.malinskiy.marathon.ios.RemoteFileManager -import com.malinskiy.marathon.ios.cmd.FileBridge +import com.malinskiy.marathon.apple.ios.RemoteFileManager +import com.malinskiy.marathon.apple.ios.cmd.FileBridge import java.io.File class JvmFileBridge(private val overwrite: Boolean = true) : FileBridge { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommand.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/KotlinProcessCommand.kt similarity index 88% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommand.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/KotlinProcessCommand.kt index 85c59204b..c0abfb451 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommand.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/KotlinProcessCommand.kt @@ -1,6 +1,6 @@ -package com.malinskiy.marathon.ios.cmd.local +package com.malinskiy.marathon.apple.ios.cmd.local -import com.malinskiy.marathon.ios.cmd.BaseCommand +import com.malinskiy.marathon.apple.ios.cmd.BaseCommand import kotlinx.coroutines.CompletableJob import kotlinx.coroutines.Deferred import kotlinx.coroutines.channels.ReceiveChannel diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutor.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/KotlinProcessCommandExecutor.kt similarity index 90% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutor.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/KotlinProcessCommandExecutor.kt index cf068439c..88de35318 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutor.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/KotlinProcessCommandExecutor.kt @@ -1,10 +1,10 @@ -package com.malinskiy.marathon.ios.cmd.local +package com.malinskiy.marathon.apple.ios.cmd.local +import com.malinskiy.marathon.apple.ios.cmd.BaseCommand +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandHost +import com.malinskiy.marathon.apple.ios.extensions.produceLinesManually import com.malinskiy.marathon.extension.withTimeoutOrNull -import com.malinskiy.marathon.ios.cmd.BaseCommand -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandHost -import com.malinskiy.marathon.ios.extensions.produceLinesManually import com.malinskiy.marathon.log.MarathonLogging import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Deferred diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessHost.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/KotlinProcessHost.kt similarity index 61% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessHost.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/KotlinProcessHost.kt index 8121f9efc..d93e1e309 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessHost.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/local/KotlinProcessHost.kt @@ -1,6 +1,6 @@ -package com.malinskiy.marathon.ios.cmd.local +package com.malinskiy.marathon.apple.ios.cmd.local -import com.malinskiy.marathon.ios.cmd.CommandHost +import com.malinskiy.marathon.apple.ios.cmd.CommandHost import java.nio.charset.Charset data class KotlinProcessHost(override val id: String = "local", override val charset: Charset = Charset.defaultCharset()) : CommandHost diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/rsync/RsyncFileBridge.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/rsync/RsyncFileBridge.kt similarity index 98% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/rsync/RsyncFileBridge.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/rsync/RsyncFileBridge.kt index 020430450..f484a5683 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/rsync/RsyncFileBridge.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/rsync/RsyncFileBridge.kt @@ -1,13 +1,13 @@ -package com.malinskiy.marathon.ios.cmd.remote.rsync +package com.malinskiy.marathon.apple.ios.cmd.remote.rsync import com.github.fracpete.processoutput4j.output.CollectingProcessOutput import com.github.fracpete.rsync4j.RSync import com.github.fracpete.rsync4j.SshPass +import com.malinskiy.marathon.apple.ios.cmd.FileBridge import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.exceptions.ConfigurationException import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.config.vendor.ios.SshAuthentication -import com.malinskiy.marathon.ios.cmd.FileBridge import com.malinskiy.marathon.log.MarathonLogging import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/rsync/RsyncTarget.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/rsync/RsyncTarget.kt similarity index 53% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/rsync/RsyncTarget.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/rsync/RsyncTarget.kt index f204fad0e..1c63c2d33 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/rsync/RsyncTarget.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/rsync/RsyncTarget.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.cmd.remote.rsync +package com.malinskiy.marathon.apple.ios.cmd.remote.rsync data class RsyncTarget( val addr: String, diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/scp/ScpFileBridge.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/scp/ScpFileBridge.kt similarity index 91% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/scp/ScpFileBridge.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/scp/ScpFileBridge.kt index 04c445c7e..5283dd389 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/scp/ScpFileBridge.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/scp/ScpFileBridge.kt @@ -1,6 +1,6 @@ -package com.malinskiy.marathon.ios.cmd.remote.scp +package com.malinskiy.marathon.apple.ios.cmd.remote.scp -import com.malinskiy.marathon.ios.cmd.FileBridge +import com.malinskiy.marathon.apple.ios.cmd.FileBridge import com.malinskiy.marathon.log.MarathonLogging import net.schmizz.sshj.SSHClient import java.io.File diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/legacy/SshjCommandExecutor.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/legacy/SshjCommandExecutor.kt similarity index 93% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/legacy/SshjCommandExecutor.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/legacy/SshjCommandExecutor.kt index a036deabd..55d175f45 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/legacy/SshjCommandExecutor.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/legacy/SshjCommandExecutor.kt @@ -2,10 +2,10 @@ // //import ch.qos.logback.classic.Level //import com.malinskiy.marathon.extension.withTimeout -//import com.malinskiy.marathon.ios.cmd.CommandExecutor -//import com.malinskiy.marathon.ios.cmd.CommandResult -//import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureException -//import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason +//import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +//import com.malinskiy.marathon.apple.ios.cmd.CommandResult +//import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureException +//import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason //import com.malinskiy.marathon.log.MarathonLogging //import kotlinx.coroutines.CoroutineName //import kotlinx.coroutines.CoroutineScope diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutor.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandExecutor.kt similarity index 91% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutor.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandExecutor.kt index 1dfdf07ba..26c787fa4 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutor.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandExecutor.kt @@ -1,17 +1,15 @@ -package com.malinskiy.marathon.ios.cmd.remote.ssh.sshj +package com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.CommandSession +import com.malinskiy.marathon.apple.ios.extensions.produceLinesManually import com.malinskiy.marathon.extension.withTimeoutOrNull -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.CommandSession -import com.malinskiy.marathon.ios.extensions.produceLines -import com.malinskiy.marathon.ios.extensions.produceLinesManually import com.malinskiy.marathon.log.MarathonLogging import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.async -import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import net.schmizz.sshj.SSHClient diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorFactory.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandExecutorFactory.kt similarity index 72% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorFactory.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandExecutorFactory.kt index c019260b6..3b2b8427a 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorFactory.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandExecutorFactory.kt @@ -1,11 +1,10 @@ -package com.malinskiy.marathon.ios.cmd.remote.ssh.sshj +package com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj +import com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.auth.SshAuthentication +import com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.config.PerformanceDefaultConfig +import com.malinskiy.marathon.apple.sshj.PatchedSSHClient import com.malinskiy.marathon.execution.withRetrySync -import com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.auth.SshAuthentication -import com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.config.PerformanceDefaultConfig import kotlinx.coroutines.channels.Channel -import net.schmizz.sshj.PatchedSSHClient -import net.schmizz.sshj.SSHClient import net.schmizz.sshj.transport.TransportException import net.schmizz.sshj.transport.verification.HostKeyVerifier import net.schmizz.sshj.transport.verification.PromiscuousVerifier @@ -41,6 +40,13 @@ class SshjCommandExecutorFactory( client.connect(addr, port) } authentication.authenticate(client) - return SshjCommandExecutor(SshjCommandHost(addr, port, authentication, client.remoteCharset), client, channelCapacity) + return SshjCommandExecutor( + SshjCommandHost( + addr, + port, + authentication, + client.remoteCharset + ), client, channelCapacity + ) } } diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandHost.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandHost.kt similarity index 73% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandHost.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandHost.kt index 7c115ed18..04d6e0f7c 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandHost.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandHost.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.cmd.remote.ssh.sshj +package com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj -import com.malinskiy.marathon.ios.cmd.CommandHost -import com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.auth.SshAuthentication +import com.malinskiy.marathon.apple.ios.cmd.CommandHost +import com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.auth.SshAuthentication import java.nio.charset.Charset /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandSession.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandSession.kt similarity index 83% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandSession.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandSession.kt index f83ff4fe4..2a9301491 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandSession.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/SshjCommandSession.kt @@ -1,11 +1,9 @@ -package com.malinskiy.marathon.ios.cmd.remote.ssh.sshj +package com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj -import com.malinskiy.marathon.ios.cmd.BaseCommand +import com.malinskiy.marathon.apple.ios.cmd.BaseCommand import kotlinx.coroutines.CompletableJob import kotlinx.coroutines.Deferred import kotlinx.coroutines.channels.ReceiveChannel -import kotlinx.coroutines.channels.SendChannel -import kotlinx.coroutines.channels.trySendBlocking import net.schmizz.sshj.connection.channel.direct.Session import net.schmizz.sshj.connection.channel.direct.Signal import java.util.concurrent.atomic.AtomicBoolean diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/auth/SshAuthentication.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/auth/SshAuthentication.kt similarity index 90% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/auth/SshAuthentication.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/auth/SshAuthentication.kt index 9b2440e05..dc86a5c28 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/auth/SshAuthentication.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/auth/SshAuthentication.kt @@ -1,8 +1,7 @@ -package com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.auth +package com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.auth import net.schmizz.sshj.SSHClient import java.io.File -import java.nio.file.Path sealed class SshAuthentication { abstract val username: String diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/config/PerformanceDefaultConfig.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/config/PerformanceDefaultConfig.kt similarity index 93% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/config/PerformanceDefaultConfig.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/config/PerformanceDefaultConfig.kt index 75b205054..e9f20a829 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/config/PerformanceDefaultConfig.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/cmd/remote/ssh/sshj/config/PerformanceDefaultConfig.kt @@ -1,16 +1,16 @@ -package com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.config +package com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.config import ch.qos.logback.classic.Level -import com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.SshjCommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.SshjCommandExecutor import com.malinskiy.marathon.log.MarathonLogging import net.schmizz.sshj.DefaultConfig +import net.schmizz.sshj.common.Factory +import net.schmizz.sshj.common.LoggerFactory +import net.schmizz.sshj.common.SecurityUtils import net.schmizz.sshj.transport.random.BouncyCastleRandom import net.schmizz.sshj.transport.random.JCERandom import net.schmizz.sshj.transport.random.Random import net.schmizz.sshj.transport.random.SingletonRandomFactory -import net.schmizz.sshj.common.Factory -import net.schmizz.sshj.common.LoggerFactory -import net.schmizz.sshj.common.SecurityUtils import org.slf4j.Logger internal class PerformanceDefaultConfig( diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/configuration/AppleTarget.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/configuration/AppleTarget.kt similarity index 98% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/configuration/AppleTarget.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/configuration/AppleTarget.kt index 6cfc76e37..cc2ca3f51 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/configuration/AppleTarget.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/configuration/AppleTarget.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.configuration +package com.malinskiy.marathon.apple.ios.configuration import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSubTypes diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/configuration/Marathondevices.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/configuration/Marathondevices.kt similarity index 83% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/configuration/Marathondevices.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/configuration/Marathondevices.kt index 785faf46d..102dd1cab 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/configuration/Marathondevices.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/configuration/Marathondevices.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.configuration +package com.malinskiy.marathon.apple.ios.configuration import com.fasterxml.jackson.annotation.JsonProperty diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/configuration/Transport.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/configuration/Transport.kt similarity index 93% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/configuration/Transport.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/configuration/Transport.kt index d82478273..93dd2e87d 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/configuration/Transport.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/configuration/Transport.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.configuration +package com.malinskiy.marathon.apple.ios.configuration import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSubTypes diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/AppleSimulatorProvider.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/AppleSimulatorProvider.kt similarity index 95% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/AppleSimulatorProvider.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/AppleSimulatorProvider.kt index 9b4679ed4..1e5028498 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/AppleSimulatorProvider.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/AppleSimulatorProvider.kt @@ -1,19 +1,19 @@ -package com.malinskiy.marathon.ios.device +package com.malinskiy.marathon.apple.ios.device import com.google.gson.Gson import com.malinskiy.marathon.actor.unboundedChannel +import com.malinskiy.marathon.apple.ios.AppleSimulatorDevice +import com.malinskiy.marathon.apple.ios.bin.AppleBinaryEnvironment +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlDevice +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlListDevicesOutput +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.FileBridge +import com.malinskiy.marathon.apple.ios.configuration.AppleTarget +import com.malinskiy.marathon.apple.ios.configuration.Transport import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.device.Device import com.malinskiy.marathon.device.DeviceProvider -import com.malinskiy.marathon.ios.AppleSimulatorDevice -import com.malinskiy.marathon.ios.bin.AppleBinaryEnvironment -import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlDevice -import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlListDevicesOutput -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.FileBridge -import com.malinskiy.marathon.ios.configuration.AppleTarget -import com.malinskiy.marathon.ios.configuration.Transport import com.malinskiy.marathon.log.MarathonLogging import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Deferred diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/ConnectionCounter.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/ConnectionCounter.kt similarity index 84% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/ConnectionCounter.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/ConnectionCounter.kt index dcf93771f..b9f178137 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/ConnectionCounter.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/ConnectionCounter.kt @@ -1,7 +1,6 @@ -package com.malinskiy.marathon.ios.device +package com.malinskiy.marathon.apple.ios.device -import com.malinskiy.marathon.ios.configuration.Transport -import kotlin.collections.HashMap +import com.malinskiy.marathon.apple.ios.configuration.Transport class ConnectionCounter { private val transports = HashMap().withDefault { 0 } diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/ConnectionFactory.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/ConnectionFactory.kt similarity index 86% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/ConnectionFactory.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/ConnectionFactory.kt index 49ecb5aa3..9012d2950 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/ConnectionFactory.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/ConnectionFactory.kt @@ -1,20 +1,20 @@ -package com.malinskiy.marathon.ios.device +package com.malinskiy.marathon.apple.ios.device +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.FileBridge +import com.malinskiy.marathon.apple.ios.cmd.local.JvmFileBridge +import com.malinskiy.marathon.apple.ios.cmd.local.KotlinProcessCommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.remote.rsync.RsyncFileBridge +import com.malinskiy.marathon.apple.ios.cmd.remote.rsync.RsyncTarget +import com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.SshjCommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.SshjCommandExecutorFactory +import com.malinskiy.marathon.apple.ios.configuration.Transport +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureException +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.exceptions.ConfigurationException import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.config.vendor.ios.SshAuthentication -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.FileBridge -import com.malinskiy.marathon.ios.cmd.local.JvmFileBridge -import com.malinskiy.marathon.ios.cmd.local.KotlinProcessCommandExecutor -import com.malinskiy.marathon.ios.cmd.remote.rsync.RsyncFileBridge -import com.malinskiy.marathon.ios.cmd.remote.rsync.RsyncTarget -import com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.SshjCommandExecutor -import com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.SshjCommandExecutorFactory -import com.malinskiy.marathon.ios.configuration.Transport -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureException -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.log.MarathonLogging import net.schmizz.sshj.connection.ConnectionException import net.schmizz.sshj.transport.TransportException @@ -80,12 +80,12 @@ class ConnectionFactory(private val configuration: Configuration, private val ve val connectionId = "${hostAddress.hostAddress}:${transport.port}" val authConfig = transport.authentication ?: vendorConfiguration.ssh.authentication val sshAuthentication = when (authConfig) { - is SshAuthentication.PasswordAuthentication -> com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.auth.SshAuthentication.PasswordAuthentication( + is SshAuthentication.PasswordAuthentication -> com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.auth.SshAuthentication.PasswordAuthentication( authConfig.username, authConfig.password ) - is SshAuthentication.PublicKeyAuthentication -> com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.auth.SshAuthentication.PublicKeyAuthentication( + is SshAuthentication.PublicKeyAuthentication -> com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.auth.SshAuthentication.PublicKeyAuthentication( authConfig.username, authConfig.key ) diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/ProvisioningPlan.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/ProvisioningPlan.kt similarity index 59% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/ProvisioningPlan.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/ProvisioningPlan.kt index de188e6b3..762afa024 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/ProvisioningPlan.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/ProvisioningPlan.kt @@ -1,6 +1,6 @@ -package com.malinskiy.marathon.ios.device +package com.malinskiy.marathon.apple.ios.device -import com.malinskiy.marathon.ios.configuration.AppleTarget +import com.malinskiy.marathon.apple.ios.configuration.AppleTarget data class ProvisioningPlan( val existingSimulators: Set, diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/SimulatorFactory.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/SimulatorFactory.kt similarity index 79% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/SimulatorFactory.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/SimulatorFactory.kt index f886a4db5..1014b5cbf 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/device/SimulatorFactory.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/device/SimulatorFactory.kt @@ -1,18 +1,18 @@ -package com.malinskiy.marathon.ios.device +package com.malinskiy.marathon.apple.ios.device import com.google.gson.Gson import com.malinskiy.marathon.analytics.internal.pub.Track +import com.malinskiy.marathon.apple.ios.AppleSimulatorDevice +import com.malinskiy.marathon.apple.ios.AppleTestBundleIdentifier +import com.malinskiy.marathon.apple.ios.bin.AppleBinaryEnvironment +import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor +import com.malinskiy.marathon.apple.ios.cmd.FileBridge +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureException +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason +import com.malinskiy.marathon.apple.ios.model.Sdk import com.malinskiy.marathon.config.Configuration import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.io.FileManager -import com.malinskiy.marathon.ios.AppleSimulatorDevice -import com.malinskiy.marathon.ios.AppleTestBundleIdentifier -import com.malinskiy.marathon.ios.bin.AppleBinaryEnvironment -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import com.malinskiy.marathon.ios.cmd.FileBridge -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureException -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason -import com.malinskiy.marathon.ios.model.Sdk import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.time.Timer diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/extensions/ConfigurationExtensions.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/extensions/ConfigurationExtensions.kt similarity index 76% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/extensions/ConfigurationExtensions.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/extensions/ConfigurationExtensions.kt index fd15e2ad4..e012b2a7f 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/extensions/ConfigurationExtensions.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/extensions/ConfigurationExtensions.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.extensions +package com.malinskiy.marathon.apple.ios.extensions +import com.malinskiy.marathon.apple.ios.model.AppleTestBundle import com.malinskiy.marathon.config.vendor.VendorConfiguration -import com.malinskiy.marathon.ios.model.AppleTestBundle fun VendorConfiguration.IOSConfiguration.testBundle(): AppleTestBundle { val xctest = bundle?.xctest ?: throw IllegalArgumentException("No test bundle provided") diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/extensions/FileExtensions.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/extensions/FileExtensions.kt similarity index 99% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/extensions/FileExtensions.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/extensions/FileExtensions.kt index 15209095d..4915d9991 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/extensions/FileExtensions.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/extensions/FileExtensions.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.extensions +package com.malinskiy.marathon.apple.ios.extensions import java.io.File diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/extensions/Reader.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/extensions/Reader.kt similarity index 97% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/extensions/Reader.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/extensions/Reader.kt index e7e1d9fa8..5faa40711 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/extensions/Reader.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/extensions/Reader.kt @@ -1,6 +1,6 @@ -package com.malinskiy.marathon.ios.extensions +package com.malinskiy.marathon.apple.ios.extensions -import com.malinskiy.marathon.ios.cmd.LineBuffer +import com.malinskiy.marathon.apple.ios.cmd.LineBuffer import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.channels.ReceiveChannel diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/AccumulatingTestResultListener.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/AccumulatingTestResultListener.kt similarity index 88% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/AccumulatingTestResultListener.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/AccumulatingTestResultListener.kt index 130d9985a..6aff63497 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/AccumulatingTestResultListener.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/AccumulatingTestResultListener.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios.executor.listener +package com.malinskiy.marathon.apple.ios.listener +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureException +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.execution.result.TestRunResultsAccumulator -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureException -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.test.Test import com.malinskiy.marathon.time.Timer diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/AppleTestRunListener.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/AppleTestRunListener.kt similarity index 82% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/AppleTestRunListener.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/AppleTestRunListener.kt index da2db4440..b9fe97238 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/AppleTestRunListener.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/AppleTestRunListener.kt @@ -1,6 +1,6 @@ -package com.malinskiy.marathon.ios.executor.listener +package com.malinskiy.marathon.apple.ios.listener -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.test.Test interface AppleTestRunListener { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/ArtifactFinderListener.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/ArtifactFinderListener.kt similarity index 94% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/ArtifactFinderListener.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/ArtifactFinderListener.kt index 84b9a4127..dce8734a0 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/ArtifactFinderListener.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/ArtifactFinderListener.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.executor.listener +package com.malinskiy.marathon.apple.ios.listener import com.malinskiy.marathon.execution.listener.LineListener import com.malinskiy.marathon.log.MarathonLogging diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/CompositeTestRunListener.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/CompositeTestRunListener.kt similarity index 91% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/CompositeTestRunListener.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/CompositeTestRunListener.kt index cabd52158..d6a16bb27 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/CompositeTestRunListener.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/CompositeTestRunListener.kt @@ -1,6 +1,6 @@ -package com.malinskiy.marathon.ios.executor.listener +package com.malinskiy.marathon.apple.ios.listener -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.test.Test class CompositeTestRunListener(private val listeners: List) : AppleTestRunListener { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/DebugTestRunListener.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/DebugTestRunListener.kt similarity index 89% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/DebugTestRunListener.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/DebugTestRunListener.kt index 51cd9150f..910fe7834 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/DebugTestRunListener.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/DebugTestRunListener.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.executor.listener +package com.malinskiy.marathon.apple.ios.listener -import com.malinskiy.marathon.ios.AppleDevice -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason +import com.malinskiy.marathon.apple.ios.AppleDevice +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.test.Test diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/ResultBundleRunListener.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/ResultBundleRunListener.kt similarity index 90% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/ResultBundleRunListener.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/ResultBundleRunListener.kt index bceb62c19..319397992 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/ResultBundleRunListener.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/ResultBundleRunListener.kt @@ -1,12 +1,12 @@ -package com.malinskiy.marathon.ios.executor.listener +package com.malinskiy.marathon.apple.ios.listener +import com.malinskiy.marathon.apple.ios.AppleDevice +import com.malinskiy.marathon.apple.ios.RemoteFileManager import com.malinskiy.marathon.config.vendor.ios.XcresultConfiguration import com.malinskiy.marathon.device.DevicePoolId import com.malinskiy.marathon.device.toDeviceInfo import com.malinskiy.marathon.io.FileManager import com.malinskiy.marathon.io.FolderType -import com.malinskiy.marathon.ios.AppleDevice -import com.malinskiy.marathon.ios.RemoteFileManager import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.test.TestBatch import java.io.File diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/TestResultsListener.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/TestResultsListener.kt similarity index 95% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/TestResultsListener.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/TestResultsListener.kt index ba9c8114a..8bcf66026 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/TestResultsListener.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/TestResultsListener.kt @@ -1,5 +1,8 @@ -package com.malinskiy.marathon.ios.executor.listener +package com.malinskiy.marathon.apple.ios.listener +import com.malinskiy.marathon.apple.ios.RemoteFileManager +import com.malinskiy.marathon.apple.ios.bin.xcrun.xcresulttool.ResultBundleFormat +import com.malinskiy.marathon.apple.ios.bin.xcrun.xcresulttool.Xcresulttool import com.malinskiy.marathon.device.Device import com.malinskiy.marathon.device.DevicePoolId import com.malinskiy.marathon.device.toDeviceInfo @@ -7,9 +10,6 @@ import com.malinskiy.marathon.execution.TestBatchResults import com.malinskiy.marathon.execution.TestResult import com.malinskiy.marathon.execution.TestStatus import com.malinskiy.marathon.execution.result.TemporalTestResult -import com.malinskiy.marathon.ios.RemoteFileManager -import com.malinskiy.marathon.ios.bin.xcrun.xcresulttool.ResultBundleFormat -import com.malinskiy.marathon.ios.bin.xcrun.xcresulttool.Xcresulttool import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.report.attachment.AttachmentCollector import com.malinskiy.marathon.report.attachment.AttachmentListener diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/TestRunListenerAdapter.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/TestRunListenerAdapter.kt similarity index 94% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/TestRunListenerAdapter.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/TestRunListenerAdapter.kt index 788edd70b..3d02e22e6 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/TestRunListenerAdapter.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/TestRunListenerAdapter.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.executor.listener +package com.malinskiy.marathon.apple.ios.listener import com.malinskiy.marathon.execution.listener.TestRunListener import com.malinskiy.marathon.test.Test diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/screenshot/ScreenCapturerTestRunListener.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/screenshot/ScreenCapturerTestRunListener.kt similarity index 94% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/screenshot/ScreenCapturerTestRunListener.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/screenshot/ScreenCapturerTestRunListener.kt index dc1808b43..ee440d81b 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/screenshot/ScreenCapturerTestRunListener.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/screenshot/ScreenCapturerTestRunListener.kt @@ -1,5 +1,8 @@ -package com.malinskiy.marathon.ios.executor.listener.screenshot +package com.malinskiy.marathon.apple.ios.listener.screenshot +import com.malinskiy.marathon.apple.ios.AppleDevice +import com.malinskiy.marathon.apple.ios.listener.AppleTestRunListener +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.config.ScreenRecordingPolicy import com.malinskiy.marathon.config.vendor.ios.ScreenshotConfiguration import com.malinskiy.marathon.device.DevicePoolId @@ -9,9 +12,6 @@ import com.malinskiy.marathon.execution.Attachment import com.malinskiy.marathon.execution.AttachmentType import com.malinskiy.marathon.io.FileManager import com.malinskiy.marathon.io.FileType -import com.malinskiy.marathon.ios.AppleDevice -import com.malinskiy.marathon.ios.executor.listener.AppleTestRunListener -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.report.attachment.AttachmentProvider import com.malinskiy.marathon.report.attachment.AttachmentProviderDelegate diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/video/ScreenRecordingListener.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/video/ScreenRecordingListener.kt similarity index 94% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/video/ScreenRecordingListener.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/video/ScreenRecordingListener.kt index 750b78ed3..4f622b32a 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/executor/listener/video/ScreenRecordingListener.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/listener/video/ScreenRecordingListener.kt @@ -1,5 +1,10 @@ -package com.malinskiy.marathon.ios.executor.listener.video +package com.malinskiy.marathon.apple.ios.listener.video +import com.malinskiy.marathon.apple.ios.AppleDevice +import com.malinskiy.marathon.apple.ios.AppleSimulatorDevice +import com.malinskiy.marathon.apple.ios.RemoteFileManager +import com.malinskiy.marathon.apple.ios.listener.AppleTestRunListener +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.config.ScreenRecordingPolicy import com.malinskiy.marathon.device.DevicePoolId import com.malinskiy.marathon.device.toDeviceInfo @@ -9,11 +14,6 @@ import com.malinskiy.marathon.execution.AttachmentType import com.malinskiy.marathon.extension.withTimeoutOrNull import com.malinskiy.marathon.io.FileManager import com.malinskiy.marathon.io.FileType -import com.malinskiy.marathon.ios.AppleDevice -import com.malinskiy.marathon.ios.AppleSimulatorDevice -import com.malinskiy.marathon.ios.RemoteFileManager -import com.malinskiy.marathon.ios.executor.listener.AppleTestRunListener -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.report.attachment.AttachmentProvider import com.malinskiy.marathon.report.attachment.AttachmentProviderDelegate diff --git a/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/TestEventProducer.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/TestEventProducer.kt new file mode 100644 index 000000000..461304eb2 --- /dev/null +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/TestEventProducer.kt @@ -0,0 +1,7 @@ +package com.malinskiy.marathon.apple.ios.logparser + +import com.malinskiy.marathon.apple.ios.test.TestEvent + +interface TestEventProducer { + fun process(line: String): List? +} diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/XctestEventProducer.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/XctestEventProducer.kt similarity index 73% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/XctestEventProducer.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/XctestEventProducer.kt index db57f5144..c1b517695 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/XctestEventProducer.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/XctestEventProducer.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios.logparser +package com.malinskiy.marathon.apple.ios.logparser -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureParser -import com.malinskiy.marathon.ios.logparser.parser.TestRunProgressParser -import com.malinskiy.marathon.ios.test.TestEvent +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureParser +import com.malinskiy.marathon.apple.ios.logparser.parser.TestRunProgressParser +import com.malinskiy.marathon.apple.ios.test.TestEvent import com.malinskiy.marathon.time.Timer /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DebugLogPrinter.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DebugLogPrinter.kt similarity index 90% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DebugLogPrinter.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DebugLogPrinter.kt index 9d07c22df..2eeb8fc55 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DebugLogPrinter.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DebugLogPrinter.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.logparser.parser +package com.malinskiy.marathon.apple.ios.logparser.parser import com.malinskiy.marathon.execution.listener.LineListener import com.malinskiy.marathon.log.MarathonLogging diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DeviceFailureException.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DeviceFailureException.kt similarity index 89% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DeviceFailureException.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DeviceFailureException.kt index 103064ecd..a1ef34401 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DeviceFailureException.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DeviceFailureException.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.logparser.parser +package com.malinskiy.marathon.apple.ios.logparser.parser enum class DeviceFailureReason { Unknown, FailedRunner, ConnectionAbort, InvalidSimulatorIdentifier, UnreachableHost, ServicesUnavailable } diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DeviceFailureParser.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DeviceFailureParser.kt similarity index 88% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DeviceFailureParser.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DeviceFailureParser.kt index 6e719610e..afc6a8e5c 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DeviceFailureParser.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DeviceFailureParser.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios.logparser.parser +package com.malinskiy.marathon.apple.ios.logparser.parser -import com.malinskiy.marathon.ios.logparser.TestEventProducer -import com.malinskiy.marathon.ios.test.TestEvent -import com.malinskiy.marathon.ios.test.TestRunFailed +import com.malinskiy.marathon.apple.ios.logparser.TestEventProducer +import com.malinskiy.marathon.apple.ios.test.TestEvent +import com.malinskiy.marathon.apple.ios.test.TestRunFailed class DeviceFailureParser : TestEventProducer { private val patterns = listOf( diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DiagnosticLogsPathFinder.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DiagnosticLogsPathFinder.kt similarity index 50% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DiagnosticLogsPathFinder.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DiagnosticLogsPathFinder.kt index b2c0f135f..e78a53328 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/DiagnosticLogsPathFinder.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/DiagnosticLogsPathFinder.kt @@ -1,5 +1,5 @@ -package com.malinskiy.marathon.ios.logparser.parser +package com.malinskiy.marathon.apple.ios.logparser.parser -import com.malinskiy.marathon.ios.executor.listener.ArtifactFinderListener +import com.malinskiy.marathon.apple.ios.listener.ArtifactFinderListener class DiagnosticLogsPathFinder : ArtifactFinderListener("""(^\s*|\s+)/.+\.log\s*$""".toRegex(), "Diagnostic logs available at") diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/SessionResultsPathFinder.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/SessionResultsPathFinder.kt similarity index 50% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/SessionResultsPathFinder.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/SessionResultsPathFinder.kt index a880e58c2..2c6f3dda7 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/SessionResultsPathFinder.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/SessionResultsPathFinder.kt @@ -1,5 +1,5 @@ -package com.malinskiy.marathon.ios.logparser.parser +package com.malinskiy.marathon.apple.ios.logparser.parser -import com.malinskiy.marathon.ios.executor.listener.ArtifactFinderListener +import com.malinskiy.marathon.apple.ios.listener.ArtifactFinderListener class SessionResultsPathFinder : ArtifactFinderListener("""(^\s*|\s+)/.+\.xcresult\s*$""".toRegex(), "Session results available at") diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParser.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/TestRunProgressParser.kt similarity index 92% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParser.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/TestRunProgressParser.kt index 106fbf862..bec3869a7 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParser.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/logparser/parser/TestRunProgressParser.kt @@ -1,11 +1,11 @@ -package com.malinskiy.marathon.ios.logparser.parser +package com.malinskiy.marathon.apple.ios.logparser.parser -import com.malinskiy.marathon.ios.logparser.TestEventProducer -import com.malinskiy.marathon.ios.test.TestEvent -import com.malinskiy.marathon.ios.test.TestFailed -import com.malinskiy.marathon.ios.test.TestIgnored -import com.malinskiy.marathon.ios.test.TestPassed -import com.malinskiy.marathon.ios.test.TestStarted +import com.malinskiy.marathon.apple.ios.logparser.TestEventProducer +import com.malinskiy.marathon.apple.ios.test.TestEvent +import com.malinskiy.marathon.apple.ios.test.TestFailed +import com.malinskiy.marathon.apple.ios.test.TestIgnored +import com.malinskiy.marathon.apple.ios.test.TestPassed +import com.malinskiy.marathon.apple.ios.test.TestStarted import com.malinskiy.marathon.log.MarathonLogging import com.malinskiy.marathon.test.Test import com.malinskiy.marathon.time.Timer diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/AppleTestBundle.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/AppleTestBundle.kt similarity index 91% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/AppleTestBundle.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/AppleTestBundle.kt index 713fda3e8..1cabc0eef 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/AppleTestBundle.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/AppleTestBundle.kt @@ -1,10 +1,10 @@ -package com.malinskiy.marathon.ios.model +package com.malinskiy.marathon.apple.ios.model import com.dd.plist.NSDictionary +import com.malinskiy.marathon.apple.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.bundle.BundleInfo import com.malinskiy.marathon.config.exceptions.ConfigurationException import com.malinskiy.marathon.execution.bundle.TestBundle -import com.malinskiy.marathon.ios.plist.PropertyList -import com.malinskiy.marathon.ios.plist.bundle.BundleInfo import com.malinskiy.marathon.log.MarathonLogging import java.io.File diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Arch.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Arch.kt similarity index 77% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Arch.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Arch.kt index d239d13ee..8ca0c82d2 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Arch.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Arch.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.model +package com.malinskiy.marathon.apple.ios.model enum class Arch(val value: String) { armv7("armv7"), diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/OS.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/OS.kt similarity index 67% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/OS.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/OS.kt index aa1ad3e0b..e62997109 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/OS.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/OS.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.model +package com.malinskiy.marathon.apple.ios.model enum class OS(val value: String) { IOS("iOS"), diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Platform.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Platform.kt similarity index 70% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Platform.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Platform.kt index ec1d4a776..fd7894a68 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Platform.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Platform.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.model +package com.malinskiy.marathon.apple.ios.model enum class Platform(val value: String) { IOS_DEVICE("ios_device"), diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Sdk.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Sdk.kt similarity index 85% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Sdk.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Sdk.kt index d94789863..2b4c0177f 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Sdk.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Sdk.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.model +package com.malinskiy.marathon.apple.ios.model enum class Sdk(val value: String) { IPHONEOS("iphoneos"), diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Simulator.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Simulator.kt similarity index 81% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Simulator.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Simulator.kt index 4201a0539..f498d7fc6 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/Simulator.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/Simulator.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.model +package com.malinskiy.marathon.apple.ios.model class Simulator { data class Profile( diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/XcodeVersion.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/XcodeVersion.kt similarity index 96% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/XcodeVersion.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/XcodeVersion.kt index aff16f255..3781dbbdb 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/model/XcodeVersion.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/model/XcodeVersion.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.model +package com.malinskiy.marathon.apple.ios.model import com.malinskiy.marathon.exceptions.DeviceSetupException diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/Delegates.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/Delegates.kt similarity index 99% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/Delegates.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/Delegates.kt index 502af1885..9377019bc 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/Delegates.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/Delegates.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.plist +package com.malinskiy.marathon.apple.ios.plist import com.dd.plist.NSArray import com.dd.plist.NSDictionary diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/PropertyList.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/PropertyList.kt similarity index 97% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/PropertyList.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/PropertyList.kt index 31dd6968c..65f9d5753 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/PropertyList.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/PropertyList.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.plist +package com.malinskiy.marathon.apple.ios.plist import com.dd.plist.NSObject import com.dd.plist.PropertyListParser diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/BundleInfo.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/BundleInfo.kt similarity index 69% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/BundleInfo.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/BundleInfo.kt index cbfa5ea0a..3c039576d 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/BundleInfo.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/BundleInfo.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.PropertyList class BundleInfo(delegate: NSDictionary) : PropertyList(delegate) { val categorization = Categorization(delegate) diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Categorization.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Categorization.kt similarity index 85% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Categorization.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Categorization.kt index e653e337d..fd8af7b07 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Categorization.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Categorization.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class Categorization(delegate: NSDictionary) { /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Help.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Help.kt similarity index 83% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Help.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Help.kt index 03d34ef73..1fca0d6ee 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Help.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Help.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class Help(delegate: NSDictionary) { /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Identification.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Identification.kt similarity index 91% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Identification.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Identification.kt index 17d6e7885..726735f8d 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Identification.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Identification.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class Identification(delegate: NSDictionary) { /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Launch.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Launch.kt similarity index 85% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Launch.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Launch.kt index e9d938722..4fc1ba911 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Launch.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Launch.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class Launch(delegate: NSDictionary) { /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/LaunchConditions.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/LaunchConditions.kt similarity index 78% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/LaunchConditions.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/LaunchConditions.kt index 796b4b9bc..84617a188 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/LaunchConditions.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/LaunchConditions.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class LaunchConditions(delegate: NSDictionary) { /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Localization.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Localization.kt similarity index 85% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Localization.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Localization.kt index 29f9565e1..d49062286 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Localization.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Localization.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor -import com.malinskiy.marathon.ios.plist.optionalArrayDelegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.optionalArrayDelegateFor class Localization(delegate: NSDictionary) { /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Naming.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Naming.kt similarity index 87% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Naming.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Naming.kt index b7f7825ff..fb9468704 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Naming.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Naming.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class Naming(delegate: NSDictionary) { /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/OperatingSystemVersion.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/OperatingSystemVersion.kt similarity index 94% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/OperatingSystemVersion.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/OperatingSystemVersion.kt index 6b2ca74ce..16d4df3ea 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/OperatingSystemVersion.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/OperatingSystemVersion.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class OperatingSystemVersion(delegate: NSDictionary) { /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Undocumented.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Undocumented.kt similarity index 85% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Undocumented.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Undocumented.kt index 5a1c06c2e..8fdfd3feb 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Undocumented.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Undocumented.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.arrayDelegateFor -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.arrayDelegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class Undocumented(delegate: NSDictionary) { val bundleSupportedPlatforms: Array by delegate.arrayDelegateFor("CFBundleSupportedPlatforms", optional = true) diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Version.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Version.kt similarity index 95% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Version.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Version.kt index 27e4c6b64..e11c5a5e4 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/plist/bundle/Version.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/plist/bundle/Version.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.plist.bundle +package com.malinskiy.marathon.apple.ios.plist.bundle import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class Version(delegate: NSDictionary) { /** diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/test/TestEvent.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/test/TestEvent.kt similarity index 82% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/test/TestEvent.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/test/TestEvent.kt index 47da8ab52..51a207706 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/test/TestEvent.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/test/TestEvent.kt @@ -1,6 +1,6 @@ -package com.malinskiy.marathon.ios.test +package com.malinskiy.marathon.apple.ios.test -import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureReason +import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureReason import com.malinskiy.marathon.test.Test sealed class TestEvent diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/test/TestRequest.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/test/TestRequest.kt similarity index 91% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/test/TestRequest.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/test/TestRequest.kt index 04c472975..bc5ac2624 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/test/TestRequest.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/test/TestRequest.kt @@ -1,4 +1,4 @@ -package com.malinskiy.marathon.ios.test +package com.malinskiy.marathon.apple.ios.test import com.malinskiy.marathon.test.Test import com.malinskiy.marathon.test.toTestName diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/TestRootFactory.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/TestRootFactory.kt similarity index 95% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/TestRootFactory.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/TestRootFactory.kt index b32175d6e..a400ece87 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/TestRootFactory.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/TestRootFactory.kt @@ -1,19 +1,19 @@ -package com.malinskiy.marathon.ios.xctestrun - +package com.malinskiy.marathon.apple.ios.xctestrun + +import com.malinskiy.marathon.apple.ios.AppleSimulatorDevice +import com.malinskiy.marathon.apple.ios.RemoteFileManager +import com.malinskiy.marathon.apple.ios.model.AppleTestBundle +import com.malinskiy.marathon.apple.ios.model.Arch +import com.malinskiy.marathon.apple.ios.model.Sdk +import com.malinskiy.marathon.apple.ios.xctestrun.v2.Metadata +import com.malinskiy.marathon.apple.ios.xctestrun.v2.TestConfiguration +import com.malinskiy.marathon.apple.ios.xctestrun.v2.TestTarget +import com.malinskiy.marathon.apple.ios.xctestrun.v2.Xctestrun import com.malinskiy.marathon.config.exceptions.ConfigurationException import com.malinskiy.marathon.config.vendor.VendorConfiguration import com.malinskiy.marathon.config.vendor.ios.TestType import com.malinskiy.marathon.exceptions.DeviceSetupException import com.malinskiy.marathon.exceptions.TransferException -import com.malinskiy.marathon.ios.AppleSimulatorDevice -import com.malinskiy.marathon.ios.RemoteFileManager -import com.malinskiy.marathon.ios.model.AppleTestBundle -import com.malinskiy.marathon.ios.model.Arch -import com.malinskiy.marathon.ios.model.Sdk -import com.malinskiy.marathon.ios.xctestrun.v2.Metadata -import com.malinskiy.marathon.ios.xctestrun.v2.TestConfiguration -import com.malinskiy.marathon.ios.xctestrun.v2.TestTarget -import com.malinskiy.marathon.ios.xctestrun.v2.Xctestrun import java.io.File import java.nio.file.Path import kotlin.io.path.createTempFile diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/TestTarget.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v0/TestTarget.kt similarity index 96% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/TestTarget.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v0/TestTarget.kt index 13742b828..cc11d2e72 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/TestTarget.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v0/TestTarget.kt @@ -1,10 +1,10 @@ -package com.malinskiy.marathon.ios.xctestrun.v0 +package com.malinskiy.marathon.apple.ios.xctestrun.v0 import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.PropertyList -import com.malinskiy.marathon.ios.plist.delegateFor -import com.malinskiy.marathon.ios.plist.optionalDelegateFor -import com.malinskiy.marathon.ios.plist.optionalArrayDelegateFor +import com.malinskiy.marathon.apple.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.optionalArrayDelegateFor +import com.malinskiy.marathon.apple.ios.plist.optionalDelegateFor open class TestTarget(delegate: NSDictionary) : PropertyList(delegate) { constructor( diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/Xctestrun.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v0/Xctestrun.kt similarity index 98% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/Xctestrun.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v0/Xctestrun.kt index c048ab0ba..653db7b10 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/Xctestrun.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v0/Xctestrun.kt @@ -1,7 +1,7 @@ -package com.malinskiy.marathon.ios.xctestrun.v0 +package com.malinskiy.marathon.apple.ios.xctestrun.v0 import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.PropertyList /** * Old version of xctestrun format without metadata diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/Xctestrun.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v1/Xctestrun.kt similarity index 85% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/Xctestrun.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v1/Xctestrun.kt index e7f9df04d..7641f6d91 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/Xctestrun.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v1/Xctestrun.kt @@ -1,9 +1,9 @@ -package com.malinskiy.marathon.ios.xctestrun.v1 +package com.malinskiy.marathon.apple.ios.xctestrun.v1 import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.PropertyList -import com.malinskiy.marathon.ios.plist.arrayDelegateFor -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.arrayDelegateFor +import com.malinskiy.marathon.apple.ios.plist.delegateFor class Xctestrun(delegate: NSDictionary) : PropertyList(delegate) { val targets: Map by lazy { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/CodeCoverageBuildableInfo.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/CodeCoverageBuildableInfo.kt similarity index 94% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/CodeCoverageBuildableInfo.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/CodeCoverageBuildableInfo.kt index 1abcc370e..44550f7c1 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/CodeCoverageBuildableInfo.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/CodeCoverageBuildableInfo.kt @@ -1,9 +1,9 @@ -package com.malinskiy.marathon.ios.xctestrun.v2 +package com.malinskiy.marathon.apple.ios.xctestrun.v2 import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.PropertyList -import com.malinskiy.marathon.ios.plist.delegateFor -import com.malinskiy.marathon.ios.plist.optionalArrayDelegateFor +import com.malinskiy.marathon.apple.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.optionalArrayDelegateFor /** * Note: unclear if all of the fields are mandatory or optional diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/Metadata.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/Metadata.kt similarity index 74% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/Metadata.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/Metadata.kt index ae8bb287c..eabcb3381 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/Metadata.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/Metadata.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios.xctestrun.v2 +package com.malinskiy.marathon.apple.ios.xctestrun.v2 import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.PropertyList -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.delegateFor class Metadata(delegate: NSDictionary) : PropertyList(delegate) { constructor(formatVersion: Int) : this(NSDictionary()) { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/TestConfiguration.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/TestConfiguration.kt similarity index 76% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/TestConfiguration.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/TestConfiguration.kt index 5cd075ae9..940390827 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/TestConfiguration.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/TestConfiguration.kt @@ -1,9 +1,9 @@ -package com.malinskiy.marathon.ios.xctestrun.v2 +package com.malinskiy.marathon.apple.ios.xctestrun.v2 import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.PropertyList -import com.malinskiy.marathon.ios.plist.delegateFor -import com.malinskiy.marathon.ios.plist.plistListDelegateFor +import com.malinskiy.marathon.apple.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.plistListDelegateFor class TestConfiguration(delegate: NSDictionary) : PropertyList(delegate) { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/TestPlan.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/TestPlan.kt similarity index 77% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/TestPlan.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/TestPlan.kt index a711e4327..639e5f5d4 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/TestPlan.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/TestPlan.kt @@ -1,8 +1,8 @@ -package com.malinskiy.marathon.ios.xctestrun.v2 +package com.malinskiy.marathon.apple.ios.xctestrun.v2 import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.PropertyList -import com.malinskiy.marathon.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.delegateFor class TestPlan(delegate: NSDictionary) : PropertyList(delegate) { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/TestTarget.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/TestTarget.kt similarity index 97% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/TestTarget.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/TestTarget.kt index a0c049452..b7756e65c 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/TestTarget.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/TestTarget.kt @@ -1,11 +1,11 @@ -package com.malinskiy.marathon.ios.xctestrun.v2 +package com.malinskiy.marathon.apple.ios.xctestrun.v2 import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.delegateFor -import com.malinskiy.marathon.ios.plist.optionalDelegateFor -import com.malinskiy.marathon.ios.plist.optionalArrayDelegateFor -import com.malinskiy.marathon.ios.xctestrun.v0.TestTarget -import com.malinskiy.marathon.ios.xctestrun.v2.TestTarget as V2TestTarget +import com.malinskiy.marathon.apple.ios.plist.delegateFor +import com.malinskiy.marathon.apple.ios.plist.optionalArrayDelegateFor +import com.malinskiy.marathon.apple.ios.plist.optionalDelegateFor +import com.malinskiy.marathon.apple.ios.xctestrun.v0.TestTarget +import com.malinskiy.marathon.apple.ios.xctestrun.v2.TestTarget as V2TestTarget class TestTarget : TestTarget { diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/Xctestrun.kt b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/Xctestrun.kt similarity index 98% rename from vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/Xctestrun.kt rename to vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/Xctestrun.kt index 93bf7f883..c6ee7d715 100644 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/Xctestrun.kt +++ b/vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/xctestrun/v2/Xctestrun.kt @@ -1,10 +1,10 @@ -package com.malinskiy.marathon.ios.xctestrun.v2 +package com.malinskiy.marathon.apple.ios.xctestrun.v2 import com.dd.plist.NSDictionary -import com.malinskiy.marathon.ios.plist.PropertyList -import com.malinskiy.marathon.ios.plist.optionalPlistDelegateFor -import com.malinskiy.marathon.ios.plist.plistDelegateFor -import com.malinskiy.marathon.ios.plist.plistListDelegateFor +import com.malinskiy.marathon.apple.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.optionalPlistDelegateFor +import com.malinskiy.marathon.apple.ios.plist.plistDelegateFor +import com.malinskiy.marathon.apple.ios.plist.plistListDelegateFor /** * V2 of xctestrun format diff --git a/vendor/vendor-ios/src/main/resources/EULA.md b/vendor/vendor-apple/ios/src/main/resources/EULA.md similarity index 100% rename from vendor/vendor-ios/src/main/resources/EULA.md rename to vendor/vendor-apple/ios/src/main/resources/EULA.md diff --git a/vendor/vendor-ios/src/main/resources/libxctest-parser.dylib b/vendor/vendor-apple/ios/src/main/resources/libxctest-parser.dylib similarity index 100% rename from vendor/vendor-ios/src/main/resources/libxctest-parser.dylib rename to vendor/vendor-apple/ios/src/main/resources/libxctest-parser.dylib diff --git a/vendor/vendor-ios/src/main/resources/xcresulttool-schema.json b/vendor/vendor-apple/ios/src/main/resources/xcresulttool-schema.json similarity index 100% rename from vendor/vendor-ios/src/main/resources/xcresulttool-schema.json rename to vendor/vendor-apple/ios/src/main/resources/xcresulttool-schema.json diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/AppleDeviceProviderTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/AppleDeviceProviderTest.kt similarity index 100% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/AppleDeviceProviderTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/AppleDeviceProviderTest.kt diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/DerivedDataManagerTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/DerivedDataManagerTest.kt similarity index 100% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/DerivedDataManagerTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/DerivedDataManagerTest.kt diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/Mocks.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/Mocks.kt similarity index 84% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/Mocks.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/Mocks.kt index eb03f88e9..9ea63264d 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/Mocks.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/Mocks.kt @@ -2,11 +2,11 @@ // //import com.google.gson.GsonBuilder //import com.malinskiy.marathon.config.vendor.VendorConfiguration -//import com.malinskiy.marathon.ios.cmd.CommandResult -//import com.malinskiy.marathon.ios.cmd.CommandSession -//import com.malinskiy.marathon.ios.configuration.RemoteSimulator -//import com.malinskiy.marathon.ios.simctl.model.SimctlDeviceList -//import com.malinskiy.marathon.ios.simctl.model.SimctlDeviceListDeserializer +//import com.malinskiy.marathon.apple.ios.cmd.CommandResult +//import com.malinskiy.marathon.apple.ios.cmd.CommandSession +//import com.malinskiy.marathon.apple.ios.configuration.RemoteSimulator +//import com.malinskiy.marathon.apple.ios.simctl.model.SimctlDeviceList +//import com.malinskiy.marathon.apple.ios.simctl.model.SimctlDeviceListDeserializer //import org.mockito.kotlin.mock //import java.time.Duration // diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommandExecutorTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommandExecutorTest.kt similarity index 99% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommandExecutorTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommandExecutorTest.kt index 1f7c888e6..93a48af24 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommandExecutorTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommandExecutorTest.kt @@ -3,7 +3,6 @@ package com.malinskiy.marathon.ios.cmd import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.async import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking diff --git a/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutorTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutorTest.kt new file mode 100644 index 000000000..3e81ff69c --- /dev/null +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutorTest.kt @@ -0,0 +1,7 @@ +package com.malinskiy.marathon.ios.cmd.local + +import com.malinskiy.marathon.apple.ios.cmd.BaseCommandExecutorTest + +class KotlinProcessCommandExecutorTest : BaseCommandExecutorTest() { + override fun createExecutor() = KotlinProcessCommandExecutor() +} diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/LineBufferTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/LineBufferTest.kt similarity index 97% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/LineBufferTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/LineBufferTest.kt index a2a95ebe7..cbd1b5df4 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/LineBufferTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/LineBufferTest.kt @@ -1,6 +1,6 @@ package com.malinskiy.marathon.ios.cmd.remote -import com.malinskiy.marathon.ios.cmd.LineBuffer +import com.malinskiy.marathon.apple.ios.cmd.LineBuffer import kotlinx.coroutines.runBlocking import org.amshove.kluent.shouldBeEmpty import org.amshove.kluent.shouldBeEqualTo diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/SshjCommandOutputWaiterTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/SshjCommandOutputWaiterTest.kt similarity index 93% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/SshjCommandOutputWaiterTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/SshjCommandOutputWaiterTest.kt index 5684ed972..5c3262164 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/SshjCommandOutputWaiterTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/SshjCommandOutputWaiterTest.kt @@ -1,6 +1,6 @@ //package com.malinskiy.marathon.ios.cmd.remote // -//import com.malinskiy.marathon.ios.cmd.remote.ssh.legacy.SshjCommandOutputWaiterImpl +//import com.malinskiy.marathon.apple.ios.cmd.remote.ssh.legacy.SshjCommandOutputWaiterImpl //import kotlinx.coroutines.runBlocking //import org.amshove.kluent.shouldBe //import org.amshove.kluent.shouldBeGreaterOrEqualTo diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshTest.kt similarity index 82% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshTest.kt index 99e0bfdcc..f128ed034 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshTest.kt @@ -1,13 +1,7 @@ package com.malinskiy.marathon.ios.cmd.remote.ssh.sshj -import com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.auth.SshAuthentication -import kotlinx.coroutines.async -import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking -import net.schmizz.sshj.transport.verification.OpenSSHKnownHosts import org.junit.jupiter.api.Test -import java.io.File -import java.time.Duration class SshTest { @Test diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshdContainer.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshdContainer.kt similarity index 100% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshdContainer.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshdContainer.kt diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorTest.kt similarity index 54% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorTest.kt index ef5dc4c35..cb5416270 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorTest.kt @@ -1,16 +1,9 @@ package com.malinskiy.marathon.ios.cmd.remote.ssh.sshj -import com.malinskiy.marathon.config.vendor.ios.SshAuthentication.PublicKeyAuthentication -import com.malinskiy.marathon.ios.cmd.BaseCommandExecutorTest -import com.malinskiy.marathon.ios.cmd.remote.ssh.sshj.auth.SshAuthentication -import kotlinx.coroutines.runBlocking -import kotlinx.coroutines.test.runTest -import net.schmizz.sshj.transport.verification.OpenSSHKnownHosts -import org.junit.jupiter.api.Test +import com.malinskiy.marathon.apple.ios.cmd.BaseCommandExecutorTest +import com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.auth.SshAuthentication import org.testcontainers.junit.jupiter.Container import org.testcontainers.junit.jupiter.Testcontainers -import java.io.File -import java.time.Duration @Testcontainers class SshjCommandExecutorTest : BaseCommandExecutorTest() { @@ -19,7 +12,7 @@ class SshjCommandExecutorTest : BaseCommandExecutorTest() { .withUsername("foo") .withPassword("secret") - override fun createExecutor() = SshjCommandExecutorFactory() + override fun createExecutor() = com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.SshjCommandExecutorFactory() .connect( sshdContainer.host, sshdContainer.firstMappedPort, diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/AppleTargetTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/AppleTargetTest.kt similarity index 100% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/AppleTargetTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/AppleTargetTest.kt diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/MarathondevicesTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/MarathondevicesTest.kt similarity index 100% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/MarathondevicesTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/MarathondevicesTest.kt diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/ProgressParserTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/ProgressParserTest.kt similarity index 93% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/ProgressParserTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/ProgressParserTest.kt index 6484bb77c..9caf8842d 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/ProgressParserTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/ProgressParserTest.kt @@ -1,8 +1,8 @@ //package com.malinskiy.marathon.ios.logparser // -//import com.malinskiy.marathon.ios.logparser.formatter.PackageNameFormatter -//import com.malinskiy.marathon.ios.executor.listener.TestRunListener -//import com.malinskiy.marathon.ios.logparser.parser.TestRunProgressParser +//import com.malinskiy.marathon.apple.ios.logparser.formatter.PackageNameFormatter +//import com.malinskiy.marathon.apple.ios.executor.listener.TestRunListener +//import com.malinskiy.marathon.apple.ios.logparser.parser.TestRunProgressParser //import com.malinskiy.marathon.time.Timer //import org.mockito.kotlin.any //import org.mockito.kotlin.atLeastOnce diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParserTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParserTest.kt similarity index 98% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParserTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParserTest.kt index 924e3a983..89a5df07d 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParserTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParserTest.kt @@ -2,13 +2,13 @@ package com.malinskiy.marathon.ios.logparser.parser import assertk.assertThat import assertk.assertions.isEqualTo -import com.malinskiy.marathon.ios.test.TestEvent +import com.malinskiy.marathon.apple.ios.test.TestEvent import com.malinskiy.marathon.time.Timer -import org.mockito.kotlin.mock -import org.mockito.kotlin.whenever import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mockito.reset +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever class TestRunProgressParserTest { private val mockTimer = mock() diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/simctl/model/SimctlDeviceListDeserializerTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/simctl/model/SimctlDeviceListDeserializerTest.kt similarity index 74% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/simctl/model/SimctlDeviceListDeserializerTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/simctl/model/SimctlDeviceListDeserializerTest.kt index ff04978b5..bc9da0c5c 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/simctl/model/SimctlDeviceListDeserializerTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/simctl/model/SimctlDeviceListDeserializerTest.kt @@ -2,9 +2,9 @@ package com.malinskiy.marathon.ios.simctl.model import com.google.gson.Gson import com.google.gson.GsonBuilder -import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlDeviceList -import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlDeviceListDeserializer -import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlListDevicesOutput +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlDeviceList +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlDeviceListDeserializer +import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlListDevicesOutput import org.amshove.kluent.`should be equal to` import org.junit.jupiter.api.Test import java.io.File diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xcresulttool/XcresulttoolTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xcresulttool/XcresulttoolTest.kt similarity index 90% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xcresulttool/XcresulttoolTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xcresulttool/XcresulttoolTest.kt index 3e6dea676..5b7659705 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xcresulttool/XcresulttoolTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xcresulttool/XcresulttoolTest.kt @@ -1,6 +1,6 @@ package com.malinskiy.marathon.ios.xcresulttool -import com.malinskiy.marathon.ios.bin.xcrun.xcresulttool.Xcresulttool.Companion.AppleJsonMapper +import com.malinskiy.marathon.apple.ios.bin.xcrun.xcresulttool.Xcresulttool.Companion.AppleJsonMapper import com.malinskiy.marathon.vendor.ios.xcrun.xcresulttool.ActionsInvocationRecord import org.amshove.kluent.shouldBeEqualTo import org.amshove.kluent.shouldBeGreaterThan diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/XctestrunTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/XctestrunTest.kt similarity index 98% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/XctestrunTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/XctestrunTest.kt index 0c363bcc2..3656d2f6e 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/XctestrunTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/XctestrunTest.kt @@ -1,6 +1,6 @@ //package com.malinskiy.marathon.ios.xctestrun // -//import com.malinskiy.marathon.ios.xctestrun.legacy.Xctestrun +//import com.malinskiy.marathon.apple.ios.xctestrun.legacy.Xctestrun //import org.amshove.kluent.shouldBeEqualTo //import org.amshove.kluent.shouldHaveKey //import org.amshove.kluent.shouldNotHaveKey diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/XctestrunTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/XctestrunTest.kt similarity index 97% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/XctestrunTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/XctestrunTest.kt index 4e7530a1a..f44e3ec08 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/XctestrunTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/XctestrunTest.kt @@ -1,6 +1,6 @@ package com.malinskiy.marathon.ios.xctestrun.v0 -import com.malinskiy.marathon.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.PropertyList import org.amshove.kluent.shouldBeEqualTo import org.junit.jupiter.api.Test import java.io.ByteArrayOutputStream diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/XctestrunTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/XctestrunTest.kt similarity index 98% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/XctestrunTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/XctestrunTest.kt index 791b7e7d1..396826df8 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/XctestrunTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/XctestrunTest.kt @@ -1,6 +1,6 @@ package com.malinskiy.marathon.ios.xctestrun.v1 -import com.malinskiy.marathon.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.PropertyList import org.amshove.kluent.shouldBeEqualTo import org.amshove.kluent.shouldContainSame import org.junit.jupiter.api.Test diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/XctestrunTest.kt b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/XctestrunTest.kt similarity index 98% rename from vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/XctestrunTest.kt rename to vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/XctestrunTest.kt index 2cc7cf6b7..c4c2622bb 100644 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/XctestrunTest.kt +++ b/vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/XctestrunTest.kt @@ -1,6 +1,6 @@ package com.malinskiy.marathon.ios.xctestrun.v2 -import com.malinskiy.marathon.ios.plist.PropertyList +import com.malinskiy.marathon.apple.ios.plist.PropertyList import org.amshove.kluent.shouldBeEqualTo import org.junit.jupiter.api.Test import java.io.ByteArrayOutputStream diff --git a/vendor/vendor-ios/src/test/resources/fixtures/derived-data-manager/test_rsa b/vendor/vendor-apple/ios/src/test/resources/fixtures/derived-data-manager/test_rsa similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/derived-data-manager/test_rsa rename to vendor/vendor-apple/ios/src/test/resources/fixtures/derived-data-manager/test_rsa diff --git a/vendor/vendor-ios/src/test/resources/fixtures/derived-data-manager/test_rsa.pub b/vendor/vendor-apple/ios/src/test/resources/fixtures/derived-data-manager/test_rsa.pub similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/derived-data-manager/test_rsa.pub rename to vendor/vendor-apple/ios/src/test/resources/fixtures/derived-data-manager/test_rsa.pub diff --git a/vendor/vendor-ios/src/test/resources/fixtures/devices/Marathondevices b/vendor/vendor-apple/ios/src/test/resources/fixtures/devices/Marathondevices similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/devices/Marathondevices rename to vendor/vendor-apple/ios/src/test/resources/fixtures/devices/Marathondevices diff --git a/vendor/vendor-ios/src/test/resources/fixtures/marathondevices/sample_1.yaml b/vendor/vendor-apple/ios/src/test/resources/fixtures/marathondevices/sample_1.yaml similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/marathondevices/sample_1.yaml rename to vendor/vendor-apple/ios/src/test/resources/fixtures/marathondevices/sample_1.yaml diff --git a/vendor/vendor-ios/src/test/resources/fixtures/simctl/list_output.json b/vendor/vendor-apple/ios/src/test/resources/fixtures/simctl/list_output.json similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/simctl/list_output.json rename to vendor/vendor-apple/ios/src/test/resources/fixtures/simctl/list_output.json diff --git a/vendor/vendor-ios/src/test/resources/fixtures/simctl/list_output_2.json b/vendor/vendor-apple/ios/src/test/resources/fixtures/simctl/list_output_2.json similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/simctl/list_output_2.json rename to vendor/vendor-apple/ios/src/test/resources/fixtures/simctl/list_output_2.json diff --git a/vendor/vendor-ios/src/test/resources/fixtures/simctl/list_output_3.json b/vendor/vendor-apple/ios/src/test/resources/fixtures/simctl/list_output_3.json similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/simctl/list_output_3.json rename to vendor/vendor-apple/ios/src/test/resources/fixtures/simctl/list_output_3.json diff --git a/vendor/vendor-ios/src/test/resources/fixtures/simulator/devices.plist b/vendor/vendor-apple/ios/src/test/resources/fixtures/simulator/devices.plist similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/simulator/devices.plist rename to vendor/vendor-apple/ios/src/test/resources/fixtures/simulator/devices.plist diff --git a/vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_0.expected b/vendor/vendor-apple/ios/src/test/resources/fixtures/test_output/patrol_0.expected similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_0.expected rename to vendor/vendor-apple/ios/src/test/resources/fixtures/test_output/patrol_0.expected diff --git a/vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_1.expected b/vendor/vendor-apple/ios/src/test/resources/fixtures/test_output/patrol_1.expected similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_1.expected rename to vendor/vendor-apple/ios/src/test/resources/fixtures/test_output/patrol_1.expected diff --git a/vendor/vendor-ios/src/test/resources/fixtures/test_output/success_0.expected b/vendor/vendor-apple/ios/src/test/resources/fixtures/test_output/success_0.expected similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/test_output/success_0.expected rename to vendor/vendor-apple/ios/src/test/resources/fixtures/test_output/success_0.expected diff --git a/vendor/vendor-ios/src/test/resources/fixtures/test_output/success_multiple_0.expected b/vendor/vendor-apple/ios/src/test/resources/fixtures/test_output/success_multiple_0.expected similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/test_output/success_multiple_0.expected rename to vendor/vendor-apple/ios/src/test/resources/fixtures/test_output/success_multiple_0.expected diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator11.2-x86_64-reordered.xctestrun b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator11.2-x86_64-reordered.xctestrun similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator11.2-x86_64-reordered.xctestrun rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator11.2-x86_64-reordered.xctestrun diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator11.2-x86_64.xctestrun b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator11.2-x86_64.xctestrun similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator11.2-x86_64.xctestrun rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator11.2-x86_64.xctestrun diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator12.1-x86_64.xctestrun b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator12.1-x86_64.xctestrun similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator12.1-x86_64.xctestrun rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/UITesting_iphonesimulator12.1-x86_64.xctestrun diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctestrun/expect_0.xctestrun b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/expect_0.xctestrun similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctestrun/expect_0.xctestrun rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/expect_0.xctestrun diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctestrun/expect_1.xctestrun b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/expect_1.xctestrun similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctestrun/expect_1.xctestrun rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/expect_1.xctestrun diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctestrun/expect_2.xctestrun b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/expect_2.xctestrun similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctestrun/expect_2.xctestrun rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/expect_2.xctestrun diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctestrun/man_v0.xctestrun b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/man_v0.xctestrun similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctestrun/man_v0.xctestrun rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/man_v0.xctestrun diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctestrun/man_v2.xctestrun b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/man_v2.xctestrun similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctestrun/man_v2.xctestrun rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctestrun/man_v2.xctestrun diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctesttool/sample_1.json b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctesttool/sample_1.json similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctesttool/sample_1.json rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctesttool/sample_1.json diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctesttool/sample_2.json b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctesttool/sample_2.json similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctesttool/sample_2.json rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctesttool/sample_2.json diff --git a/vendor/vendor-ios/src/test/resources/fixtures/xctesttool/testplanrunsummary_1.json b/vendor/vendor-apple/ios/src/test/resources/fixtures/xctesttool/testplanrunsummary_1.json similarity index 100% rename from vendor/vendor-ios/src/test/resources/fixtures/xctesttool/testplanrunsummary_1.json rename to vendor/vendor-apple/ios/src/test/resources/fixtures/xctesttool/testplanrunsummary_1.json diff --git a/vendor/vendor-ios/src/test/resources/logback-test.xml b/vendor/vendor-apple/ios/src/test/resources/logback-test.xml similarity index 100% rename from vendor/vendor-ios/src/test/resources/logback-test.xml rename to vendor/vendor-apple/ios/src/test/resources/logback-test.xml diff --git a/vendor/vendor-ios/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/vendor/vendor-apple/ios/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from vendor/vendor-ios/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to vendor/vendor-apple/ios/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/.gitignore b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/.gitignore similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/.gitignore rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/.gitignore diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/Marathondevices b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/Marathondevices similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/Marathondevices rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/Marathondevices diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/Marathonfile b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/Marathonfile similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/Marathonfile rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/Marathonfile diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/build-for-testing.sh b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/build-for-testing.sh similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/build-for-testing.sh rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/build-for-testing.sh diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/project.pbxproj b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/project.pbxproj similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/project.pbxproj rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/project.pbxproj diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/xcshareddata/xcschemes/UITesting.xcscheme b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/xcshareddata/xcschemes/UITesting.xcscheme similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/xcshareddata/xcschemes/UITesting.xcscheme rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/xcshareddata/xcschemes/UITesting.xcscheme diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcworkspace/contents.xcworkspacedata b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app.xcworkspace/contents.xcworkspacedata similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcworkspace/contents.xcworkspacedata rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app.xcworkspace/contents.xcworkspacedata diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/AppDelegate.swift b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/AppDelegate.swift similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/AppDelegate.swift rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/AppDelegate.swift diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/Assets.xcassets/AppIcon.appiconset/Contents.json b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/Assets.xcassets/AppIcon.appiconset/Contents.json rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/Base.lproj/LaunchScreen.storyboard b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/Base.lproj/LaunchScreen.storyboard rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/Base.lproj/LaunchScreen.storyboard diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/Base.lproj/Main.storyboard b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/Base.lproj/Main.storyboard similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/Base.lproj/Main.storyboard rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/Base.lproj/Main.storyboard diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/Info.plist b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/Info.plist similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app/Info.plist rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-app/Info.plist diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/BooleanExtensions.swift b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/BooleanExtensions.swift similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/BooleanExtensions.swift rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/BooleanExtensions.swift diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/CrashingTests.swift b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/CrashingTests.swift similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/CrashingTests.swift rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/CrashingTests.swift diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/FailingTests.swift b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/FailingTests.swift similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/FailingTests.swift rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/FailingTests.swift diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/FlakyTests.swift b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/FlakyTests.swift similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/FlakyTests.swift rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/FlakyTests.swift diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/Info.plist b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/Info.plist similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/Info.plist rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/Info.plist diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/MoreTests.swift b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/MoreTests.swift similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/MoreTests.swift rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/MoreTests.swift diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/SkippedSuite.swift b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/SkippedSuite.swift similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/SkippedSuite.swift rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/SkippedSuite.swift diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/SlowTests.swift b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/SlowTests.swift similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/SlowTests.swift rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/SlowTests.swift diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/StoryboardTests.swift b/vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/StoryboardTests.swift similarity index 100% rename from vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-appUITests/StoryboardTests.swift rename to vendor/vendor-apple/ios/src/test/resources/sample-xcworkspace/sample-appUITests/StoryboardTests.swift diff --git a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/TestEventProducer.kt b/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/TestEventProducer.kt deleted file mode 100644 index b69b804dd..000000000 --- a/vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/TestEventProducer.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.malinskiy.marathon.ios.logparser - -import com.malinskiy.marathon.ios.test.TestEvent - -interface TestEventProducer { - fun process(line: String): List? -} diff --git a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutorTest.kt b/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutorTest.kt deleted file mode 100644 index e387910b6..000000000 --- a/vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutorTest.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.malinskiy.marathon.ios.cmd.local - -import com.malinskiy.marathon.ios.cmd.BaseCommandExecutorTest -import com.malinskiy.marathon.ios.cmd.CommandExecutor -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.TimeoutCancellationException -import kotlinx.coroutines.runBlocking -import org.amshove.kluent.invoking -import org.amshove.kluent.shouldBeEqualTo -import org.amshove.kluent.shouldHaveSize -import org.amshove.kluent.shouldThrow -import org.junit.jupiter.api.Test -import java.nio.charset.Charset -import java.time.Duration - -class KotlinProcessCommandExecutorTest : BaseCommandExecutorTest() { - override fun createExecutor() = KotlinProcessCommandExecutor() -} diff --git a/vendor/vendor-ios/src/test/resources/fixtures/test_output/mixed_0.log b/vendor/vendor-ios/src/test/resources/fixtures/test_output/mixed_0.log deleted file mode 100644 index 20db0b7e3..000000000 --- a/vendor/vendor-ios/src/test/resources/fixtures/test_output/mixed_0.log +++ /dev/null @@ -1,55 +0,0 @@ -Test Suite 'Selected tests' started at 2018-09-15 20:02:22.316 -Test Suite 'sample-appUITests.xctest' started at 2018-09-15 20:02:22.317 -Test Suite 'FlakyTests' started at 2018-09-15 20:02:22.317 -Test Case '-[sample_appUITests.FlakyTests testTextFlaky3]' started. - t = 0.00s Start Test at 2018-09-15 20:02:22.318 - t = 0.05s Set Up - t = 0.05s Open com.agoda.sample-app - t = 0.08s Launch com.agoda.sample-app - t = 5.43s Wait for com.agoda.sample-app to idle - t = 6.68s Tear Down -Test Case '-[sample_appUITests.FlakyTests testTextFlaky3]' passed (6.879 seconds). -Test Case '-[sample_appUITests.FlakyTests testTextFlaky4]' started. - t = 0.00s Start Test at 2018-09-15 20:02:29.198 - t = 0.01s Set Up - t = 0.11s Open com.agoda.sample-app - t = 0.12s Launch com.agoda.sample-app - t = 0.12s Terminate com.agoda.sample-app:9038 - t = 2.85s Wait for com.agoda.sample-app to idle - t = 3.87s Tear Down -Test Case '-[sample_appUITests.FlakyTests testTextFlaky4]' passed (4.072 seconds). -Test Case '-[sample_appUITests.FlakyTests testTextFlaky5]' started. - t = 0.00s Start Test at 2018-09-15 20:02:33.270 - t = 0.01s Set Up - t = 0.12s Open com.agoda.sample-app - t = 0.13s Launch com.agoda.sample-app - t = 0.13s Terminate com.agoda.sample-app:9058 - t = 2.86s Wait for com.agoda.sample-app to idle - t = 4.10s Tear Down -Test Case '-[sample_appUITests.FlakyTests testTextFlaky5]' passed (4.301 seconds). -Test Case '-[sample_appUITests.FlakyTests testTextFlaky6]' started. - t = 0.00s Start Test at 2018-09-15 20:02:37.571 - t = 0.01s Set Up - t = 0.11s Open com.agoda.sample-app - t = 0.13s Launch com.agoda.sample-app - t = 0.13s Terminate com.agoda.sample-app:9079 - t = 3.06s Wait for com.agoda.sample-app to idle - t = 4.13s Assertion Failure: FlakyTests.swift:63: XCTAssertTrue failed - - t = 4.14s Tear Down -Test Case '-[sample_appUITests.FlakyTests testTextFlaky6]' failed (4.341 seconds). -Test Case '-[sample_appUITests.FlakyTests testTextFlaky7]' started. - t = 0.00s Start Test at 2018-09-15 20:02:41.912 - t = 0.01s Set Up - t = 0.11s Open com.agoda.sample-app - t = 0.12s Launch com.agoda.sample-app - t = 0.12s Terminate com.agoda.sample-app:9093 - t = 2.86s Wait for com.agoda.sample-app to idle - t = 4.03s Assertion Failure: FlakyTests.swift:68: XCTAssertTrue failed - - t = 4.04s Tear Down -Test Case '-[sample_appUITests.FlakyTests testTextFlaky7]' failed (4.243 seconds). -Test Suite 'FlakyTests' failed at 2018-09-15 20:02:46.156. - Executed 5 tests, with 2 failures (0 unexpected) in 23.836 (23.839) seconds -Test Suite 'sample-appUITests.xctest' failed at 2018-09-15 20:02:46.156. - Executed 5 tests, with 2 failures (0 unexpected) in 23.836 (23.839) seconds -Test Suite 'Selected tests' failed at 2018-09-15 20:02:46.157. - Executed 5 tests, with 2 failures (0 unexpected) in 23.836 (23.840) seconds diff --git a/vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_0.log b/vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_0.log deleted file mode 100644 index 7e1dfd1e2..000000000 --- a/vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_0.log +++ /dev/null @@ -1,143 +0,0 @@ -Command line invocation: - /Applications/Xcode-14.3.1.app/Contents/Developer/usr/bin/xcodebuild test-without-building -xctestrun /tmp/marathon/9DB21872-32E0-4ACF-9D76-67831CDC3938/marathon.xctestrun -enableCodeCoverage NO -destination-timeout 30 -destination "platform=iOS simulator,id=9DB21872-32E0-4ACF-9D76-67831CDC3938" - -User defaults from command line: - IDEPackageSupportUseBuiltinSCM = YES - -Testing started -objc[89195]: Class XCTestCaseSuite is implemented in both /Applications/Xcode-14.3.1.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/XCTestCore.framework/XCTestCore (0x104e73e48) and /private/tmp/marathon/9DB21872-32E0-4ACF-9D76-67831CDC3938/libxctest-parser.dylib (0x1048b4888). One of the two will be used. Which one is undefined. -2023-10-13 13:51:11.282 RunnerUITests-Runner[89195:11174198] Running tests... -2023-10-13 13:51:11.345 RunnerUITests-Runner[89195:11174198] PatrolServer: INFO: PATROL_PORT is null, falling back to default (8081) -2023-10-13 13:51:11.345 RunnerUITests-Runner[89195:11174198] PatrolServer: INFO: PatrolServer constructor called -2023-10-13 13:51:11.345 RunnerUITests-Runner[89195:11174198] PatrolServer: INFO: PATROL_ENABLED flag is defined -2023-10-13 13:51:11.346 RunnerUITests-Runner[89195:11174198] PatrolServer: INFO: Starting server... -2023-10-13 13:51:11.347 RunnerUITests-Runner[89195:11174198] PatrolServer: INFO: Server started on http://0.0.0.0:8081 -2023-10-13 13:51:11.347 RunnerUITests-Runner[89195:11174198] PatrolAppServiceClient: created, port: 8082 - t = nans Checking existence of `"Allow" Button` - t = nans Open pl.leancode.patrol.Example - t = nans Launch pl.leancode.patrol.Example - t = nans Setting up automation session - t = nans Wait for pl.leancode.patrol.Example to idle -2023-10-13 13:51:12.342 RunnerUITests-Runner[89195:11174297] PatrolServer: INFO: App reported that it is ready -2023-10-13 13:51:13.131 RunnerUITests-Runner[89195:11174198] PatrolAppServiceClient.listDartTests() -2023-10-13 13:51:14.132 RunnerUITests-Runner[89195:11174198] Got 26 Dart tests: ( - "android_app_test taps around", - "example_test counter state is the same after going to Home and switching apps", - "internal.group_test at the beginning", - "internal.group_test top level group in file alpha first", - "internal.group_test top level group in file alpha second", - "internal.group_test top level group in file in the middle", - "internal.group_test top level group in file bravo first", - "internal.group_test top level group in file bravo second", - "internal.long_name_test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - "internal.long_name_test alphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaa", - "internal.long_name_test kocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykk", - "open_app_test open maps", - "open_app_test open browser", - "open_quick_settings_test opens quick settings", - "permissions.notifications_test taps on notification", - "permissions.permissions_location_test accepts location permission", - "permissions.permissions_many_test grants various permissions", - "service_airplane_mode_test disables and enables airplane mode twice", - "service_bluetooth_test disables and enables bluetooth twice", - "service_cellular_test disables and enables cellular twice", - "service_dark_mode_test disables and enables dark mode twice", - "service_wifi_test disables and enables wifi twice", - "swipe_test scrolls the Settings app", - "webview_hackernews_test interacts with the orange website in a webview", - "webview_leancode_test interacts with the LeanCode website in a webview", - "webview_stackoverflow_test interacts with the StackOverflow website in a webview" -) -2023-10-13 13:51:14.133 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = androidAppTest___tapsAround, signature: -2023-10-13 13:51:14.133 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = exampleTest___counterStateIsTheSameAfterGoingToHomeAndSwitchingApps, signature: -2023-10-13 13:51:14.133 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = internal_groupTest___atTheBeginning, signature: -2023-10-13 13:51:14.133 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = internal_groupTest___topLevelGroupInFileAlphaFirst, signature: -2023-10-13 13:51:14.133 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = internal_groupTest___topLevelGroupInFileAlphaSecond, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = internal_groupTest___topLevelGroupInFileInTheMiddle, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = internal_groupTest___topLevelGroupInFileBravoFirst, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = internal_groupTest___topLevelGroupInFileBravoSecond, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = internal_longNameTest___aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = internal_longNameTest___alphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaa, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = internal_longNameTest___kocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykk, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = openAppTest___openMaps, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = openAppTest___openBrowser, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = openQuickSettingsTest___opensQuickSettings, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = permissions_notificationsTest___tapsOnNotification, signature: -2023-10-13 13:51:14.134 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = permissions_permissionsLocationTest___acceptsLocationPermission, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = permissions_permissionsManyTest___grantsVariousPermissions, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = serviceAirplaneModeTest___disablesAndEnablesAirplaneModeTwice, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = serviceBluetoothTest___disablesAndEnablesBluetoothTwice, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = serviceCellularTest___disablesAndEnablesCellularTwice, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = serviceDarkModeTest___disablesAndEnablesDarkModeTwice, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = serviceWifiTest___disablesAndEnablesWifiTwice, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = swipeTest___scrollsTheSettingsApp, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = webviewHackernewsTest___interactsWithTheOrangeWebsiteInAWebview, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = webviewLeancodeTest___interactsWithTheLeanCodeWebsiteInAWebview, signature: -2023-10-13 13:51:14.135 RunnerUITests-Runner[89195:11174198] RunnerUITests.testInvocations(): selectorName = webviewStackoverflowTest___interactsWithTheStackOverflowWebsiteInAWebview, signature: -Test Suite 'All tests' started at 2023-10-13 13:51:14.148 -Test Suite 'marathon.xctest' started at 2023-10-13 13:51:14.148 -Test Suite 'RunnerUITests' started at 2023-10-13 13:51:14.148 - t = nans Suite Tear Down -Test Case '-[RunnerUITests androidAppTest___tapsAround]' started. -Test Case '-[RunnerUITests androidAppTest___tapsAround]' passed (0.204 seconds). -Test Case '-[RunnerUITests exampleTest___counterStateIsTheSameAfterGoingToHomeAndSwitchingApps]' started. -Test Case '-[RunnerUITests exampleTest___counterStateIsTheSameAfterGoingToHomeAndSwitchingApps]' passed (0.000 seconds). -Test Case '-[RunnerUITests internal_groupTest___atTheBeginning]' started. -Test Case '-[RunnerUITests internal_groupTest___atTheBeginning]' passed (0.000 seconds). -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileAlphaFirst]' started. -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileAlphaFirst]' passed (0.000 seconds). -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileAlphaSecond]' started. -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileAlphaSecond]' passed (0.000 seconds). -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileInTheMiddle]' started. -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileInTheMiddle]' passed (0.000 seconds). -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileBravoFirst]' started. -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileBravoFirst]' passed (0.000 seconds). -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileBravoSecond]' started. -Test Case '-[RunnerUITests internal_groupTest___topLevelGroupInFileBravoSecond]' passed (0.000 seconds). -Test Case '-[RunnerUITests internal_longNameTest___aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa]' started. -Test Case '-[RunnerUITests internal_longNameTest___aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa]' passed (0.000 seconds). -Test Case '-[RunnerUITests internal_longNameTest___alphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaa]' started. -Test Case '-[RunnerUITests internal_longNameTest___alphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaalphaa]' passed (0.001 seconds). -Test Case '-[RunnerUITests internal_longNameTest___kocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykk]' started. -Test Case '-[RunnerUITests internal_longNameTest___kocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykkocykk]' passed (0.000 seconds). -Test Case '-[RunnerUITests openAppTest___openMaps]' started. -Test Case '-[RunnerUITests openAppTest___openMaps]' passed (0.000 seconds). -Test Case '-[RunnerUITests openAppTest___openBrowser]' started. -Test Case '-[RunnerUITests openAppTest___openBrowser]' passed (0.000 seconds). -Test Case '-[RunnerUITests openQuickSettingsTest___opensQuickSettings]' started. -Test Case '-[RunnerUITests openQuickSettingsTest___opensQuickSettings]' passed (0.000 seconds). -Test Case '-[RunnerUITests permissions_notificationsTest___tapsOnNotification]' started. -Test Case '-[RunnerUITests permissions_notificationsTest___tapsOnNotification]' passed (0.000 seconds). -Test Case '-[RunnerUITests permissions_permissionsLocationTest___acceptsLocationPermission]' started. -Test Case '-[RunnerUITests permissions_permissionsLocationTest___acceptsLocationPermission]' passed (0.000 seconds). -Test Case '-[RunnerUITests permissions_permissionsManyTest___grantsVariousPermissions]' started. -Test Case '-[RunnerUITests permissions_permissionsManyTest___grantsVariousPermissions]' passed (0.000 seconds). -Test Case '-[RunnerUITests serviceAirplaneModeTest___disablesAndEnablesAirplaneModeTwice]' started. -Test Case '-[RunnerUITests serviceAirplaneModeTest___disablesAndEnablesAirplaneModeTwice]' passed (0.000 seconds). -Test Case '-[RunnerUITests serviceBluetoothTest___disablesAndEnablesBluetoothTwice]' started. -Test Case '-[RunnerUITests serviceBluetoothTest___disablesAndEnablesBluetoothTwice]' passed (0.000 seconds). -Test Case '-[RunnerUITests serviceCellularTest___disablesAndEnablesCellularTwice]' started. -Test Case '-[RunnerUITests serviceCellularTest___disablesAndEnablesCellularTwice]' passed (0.000 seconds). -Test Case '-[RunnerUITests serviceDarkModeTest___disablesAndEnablesDarkModeTwice]' started. -Test Case '-[RunnerUITests serviceDarkModeTest___disablesAndEnablesDarkModeTwice]' passed (0.000 seconds). -Test Case '-[RunnerUITests serviceWifiTest___disablesAndEnablesWifiTwice]' started. -Test Case '-[RunnerUITests serviceWifiTest___disablesAndEnablesWifiTwice]' passed (0.000 seconds). -Test Case '-[RunnerUITests swipeTest___scrollsTheSettingsApp]' started. -Test Case '-[RunnerUITests swipeTest___scrollsTheSettingsApp]' passed (0.000 seconds). -Test Case '-[RunnerUITests webviewHackernewsTest___interactsWithTheOrangeWebsiteInAWebview]' started. -Test Case '-[RunnerUITests webviewHackernewsTest___interactsWithTheOrangeWebsiteInAWebview]' passed (0.000 seconds). -Test Case '-[RunnerUITests webviewLeancodeTest___interactsWithTheLeanCodeWebsiteInAWebview]' started. -Test Case '-[RunnerUITests webviewLeancodeTest___interactsWithTheLeanCodeWebsiteInAWebview]' passed (0.000 seconds). -Test Case '-[RunnerUITests webviewStackoverflowTest___interactsWithTheStackOverflowWebsiteInAWebview]' started. -Test Case '-[RunnerUITests webviewStackoverflowTest___interactsWithTheStackOverflowWebsiteInAWebview]' passed (0.000 seconds). -Test Suite 'RunnerUITests' passed at 2023-10-13 13:51:14.358. - Executed 26 tests, with 0 failures (0 unexpected) in 0.207 (0.210) seconds -Test Suite 'marathon.xctest' passed at 2023-10-13 13:51:14.358. - Executed 26 tests, with 0 failures (0 unexpected) in 0.207 (0.210) seconds -Test Suite 'All tests' passed at 2023-10-13 13:51:14.358. - Executed 26 tests, with 0 failures (0 unexpected) in 0.207 (0.211) seconds - -Test session results, code coverage, and logs: - /var/folders/7v/6_pt9v493mx8yl5837ymblw80000gn/T/E9A463C5-EA19-4D07-9BE2-B21A150940C3/DerivedData/temporary/Logs/Test/Test-Transient Testing-2023.10.13_13-51-03-+1000.xcresult - -** TEST EXECUTE SUCCEEDED ** diff --git a/vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_1.log b/vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_1.log deleted file mode 100644 index d67ec016f..000000000 --- a/vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_1.log +++ /dev/null @@ -1,17 +0,0 @@ -Test Suite 'All tests' started at 2024-02-07 13:58:21.952 -Test Suite 'marathon.xctest' started at 2024-02-07 13:58:21.953 -Test Suite 'RunnerUITests' started at 2024-02-07 13:58:21.953 - t = nans Suite Tear Down -Test Case '-[RunnerUITests ab.example_test+tty]' started. -Test Case '-[RunnerUITests ab.example_test+tty]' passed (0.206 seconds). -Test Suite 'RunnerUITests' passed at 2024-02-07 13:58:22.159. - Executed 1 test, with 0 failures (0 unexpected) in 0.206 (0.206) seconds -Test Suite 'marathon.xctest' passed at 2024-02-07 13:58:22.160. - Executed 1 test, with 0 failures (0 unexpected) in 0.206 (0.207) seconds -Test Suite 'All tests' passed at 2024-02-07 13:58:22.160. - Executed 1 test, with 0 failures (0 unexpected) in 0.206 (0.207) seconds - -Test session results, code coverage, and logs: - /Users/xxx/Library/Developer/Xcode/DerivedData/temporary-asdgsga/Logs/Test/Test-Transient Testing-2024.02.07_13-57-27-+0000.xcresult - -** TEST EXECUTE SUCCEEDED ** diff --git a/vendor/vendor-ios/src/test/resources/fixtures/test_output/success_0.log b/vendor/vendor-ios/src/test/resources/fixtures/test_output/success_0.log deleted file mode 100644 index 13398453e..000000000 --- a/vendor/vendor-ios/src/test/resources/fixtures/test_output/success_0.log +++ /dev/null @@ -1,35 +0,0 @@ -User defaults from command line: - IDEDerivedDataPathOverride = /Users/pkunzip/Development/marathon/vendor-ios/src/test/resources/src/sample-xcworkspace/a - IDETestRunOnlyIdentifiers = ( - "sample-appUITests/MoreTests/testPresentModal" -) - IDETestRunSpecificationPath = /Users/pkunzip/Development/marathon/vendor-ios/src/test/resources/src/sample-xcworkspace/a/Build/Products/UITesting_iphonesimulator11.2-x86_64.xctestrun - -2018-09-15 01:08:49.715033+0700 sample-appUITests-Runner[26010:493593] +[CATransaction synchronize] called within transaction -2018-09-15 01:08:49.725248+0700 sample-appUITests-Runner[26010:493593] Running tests... -Test Suite 'Selected tests' started at 2018-09-15 01:08:51.146 -Test Suite 'sample-appUITests.xctest' started at 2018-09-15 01:08:51.147 -Test Suite 'MoreTests' started at 2018-09-15 01:08:51.147 -Test Case '-[sample_appUITests.MoreTests testPresentModal]' started. - t = 0.00s Start Test at 2018-09-15 01:08:51.148 - t = 0.03s Set Up - t = 0.03s Open com.agoda.sample-app - t = 0.06s Launch com.agoda.sample-app - t = 2.61s Wait for com.agoda.sample-app to idle - t = 3.85s Waiting 30.0s for Button to exist - t = 4.85s Checking `Expect predicate `exists == 1` for object Button` - t = 4.86s Tap Button - t = 4.86s Wait for com.agoda.sample-app to idle - t = 4.87s Find the Button - t = 4.98s Wait for com.agoda.sample-app to idle - t = 4.99s Synthesize event - t = 5.07s Wait for com.agoda.sample-app to idle - t = 5.11s Tear Down -Test Case '-[sample_appUITests.MoreTests testPresentModal]' passed (5.315 seconds). -Test Suite 'MoreTests' passed at 2018-09-15 01:08:56.463. - Executed 1 test, with 0 failures (0 unexpected) in 5.315 (5.316) seconds -Test Suite 'sample-appUITests.xctest' passed at 2018-09-15 01:08:56.464. - Executed 1 test, with 0 failures (0 unexpected) in 5.315 (5.317) seconds -Test Suite 'Selected tests' passed at 2018-09-15 01:08:56.464. - Executed 1 test, with 0 failures (0 unexpected) in 5.315 (5.318) seconds -** TEST EXECUTE SUCCEEDED ** diff --git a/vendor/vendor-ios/src/test/resources/fixtures/test_output/success_multiple_0.log b/vendor/vendor-ios/src/test/resources/fixtures/test_output/success_multiple_0.log deleted file mode 100644 index 924ecb172..000000000 --- a/vendor/vendor-ios/src/test/resources/fixtures/test_output/success_multiple_0.log +++ /dev/null @@ -1,27 +0,0 @@ -Test Suite 'Selected tests' started at 2018-09-15 17:54:10.750 -Test Suite 'sample-appUITests.xctest' started at 2018-09-15 17:54:10.750 -Test Suite 'FlakyTests' started at 2018-09-15 17:54:10.751 -Test Case '-[sample_appUITests.FlakyTests testTextFlaky1]' started. - t = 0.00s Start Test at 2018-09-15 17:54:10.751 - t = 0.04s Set Up - t = 0.04s Open com.agoda.sample-app - t = 0.06s Launch com.agoda.sample-app - t = 2.98s Wait for com.agoda.sample-app to idle - t = 4.21s Tear Down -Test Case '-[sample_appUITests.FlakyTests testTextFlaky1]' passed (4.415 seconds). -Test Case '-[sample_appUITests.FlakyTests testTextFlaky2]' started. - t = 0.00s Start Test at 2018-09-15 17:54:15.166 - t = 0.01s Set Up - t = 0.11s Open com.agoda.sample-app - t = 0.12s Launch com.agoda.sample-app - t = 0.12s Terminate com.agoda.sample-app:2190 - t = 2.80s Wait for com.agoda.sample-app to idle - t = 3.92s Tear Down -Test Case '-[sample_appUITests.FlakyTests testTextFlaky2]' passed (4.118 seconds). -Test Suite 'FlakyTests' passed at 2018-09-15 17:54:19.285. - Executed 2 tests, with 0 failures (0 unexpected) in 8.533 (8.534) seconds -Test Suite 'sample-appUITests.xctest' passed at 2018-09-15 17:54:19.285. - Executed 2 tests, with 0 failures (0 unexpected) in 8.533 (8.535) seconds -Test Suite 'Selected tests' passed at 2018-09-15 17:54:19.286. - Executed 2 tests, with 0 failures (0 unexpected) in 8.533 (8.536) seconds -** TEST EXECUTE SUCCEEDED ** diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/.gitignore b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/.gitignore deleted file mode 100644 index 8f2265f2f..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!Build diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib deleted file mode 100644 index a63ca4016..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/LaunchScreen.storyboardc/Info.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/LaunchScreen.storyboardc/Info.plist deleted file mode 100644 index 32288e88f..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/LaunchScreen.storyboardc/Info.plist and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib deleted file mode 100644 index de94c5731..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/objects-11.0+.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/objects-11.0+.nib deleted file mode 100644 index 1fe3bef9b..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/objects-11.0+.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/runtime.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/runtime.nib deleted file mode 100644 index 47a958edd..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/runtime.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/objects-11.0+.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/objects-11.0+.nib deleted file mode 100644 index 6c9d8db84..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/objects-11.0+.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/runtime.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/runtime.nib deleted file mode 100644 index a2414ca09..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/runtime.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/Info.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/Info.plist deleted file mode 100644 index e57e4bbce..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/Info.plist and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/objects-11.0+.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/objects-11.0+.nib deleted file mode 100644 index 5a0fcc08d..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/objects-11.0+.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/runtime.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/runtime.nib deleted file mode 100644 index ad4f508f6..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/runtime.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/objects-11.0+.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/objects-11.0+.nib deleted file mode 100644 index 417cd21b3..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/objects-11.0+.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/runtime.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/runtime.nib deleted file mode 100644 index ea2c47711..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/runtime.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/objects-11.0+.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/objects-11.0+.nib deleted file mode 100644 index 81792ec58..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/objects-11.0+.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/runtime.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/runtime.nib deleted file mode 100644 index 1e4517a1f..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/runtime.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/objects-11.0+.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/objects-11.0+.nib deleted file mode 100644 index ba3041a5c..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/objects-11.0+.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/runtime.nib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/runtime.nib deleted file mode 100644 index ce4131f38..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/runtime.nib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCore.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCore.dylib deleted file mode 100755 index c8856ca1c..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCore.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCoreFoundation.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCoreFoundation.dylib deleted file mode 100755 index 8331f4e39..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCoreFoundation.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCoreGraphics.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCoreGraphics.dylib deleted file mode 100755 index 01e7f34fd..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCoreGraphics.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCoreImage.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCoreImage.dylib deleted file mode 100755 index 79b600200..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftCoreImage.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftDarwin.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftDarwin.dylib deleted file mode 100755 index 27683799f..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftDarwin.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftDispatch.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftDispatch.dylib deleted file mode 100755 index ebcbf3ec0..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftDispatch.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftFoundation.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftFoundation.dylib deleted file mode 100755 index 2813d602b..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftFoundation.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftMetal.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftMetal.dylib deleted file mode 100755 index 1f0f24906..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftMetal.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftObjectiveC.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftObjectiveC.dylib deleted file mode 100755 index 3d5295d8c..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftObjectiveC.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftQuartzCore.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftQuartzCore.dylib deleted file mode 100755 index b3e7e355b..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftQuartzCore.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftUIKit.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftUIKit.dylib deleted file mode 100755 index 6bbd4a45c..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftUIKit.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftos.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftos.dylib deleted file mode 100755 index 04c4ac367..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Frameworks/libswiftos.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Info.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Info.plist deleted file mode 100644 index 1a114b417..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/Info.plist and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/PkgInfo b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/PkgInfo deleted file mode 100644 index bd04210fb..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/_CodeSignature/CodeResources b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/_CodeSignature/CodeResources deleted file mode 100644 index ce63efa91..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/_CodeSignature/CodeResources +++ /dev/null @@ -1,560 +0,0 @@ - - - - - files - - Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - - dW6/EMGCij2QRRne+ltAQC811Qg= - - Base.lproj/LaunchScreen.storyboardc/Info.plist - - n2t8gsDpfE6XkhG31p7IQJRxTxU= - - Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - - M2zpq4mZX7KX/nYXCI3iXA/UJMo= - - Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/objects-11.0+.nib - - kdCSGdBzWn6VnflnUVjaLW3XI8o= - - Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/runtime.nib - - lxGbCIPdFAVkSn0Vbf54hR8gQTM= - - Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/objects-11.0+.nib - - c/L5WNJBB66ZOdUwDkp2G81V7QI= - - Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/runtime.nib - - BOCXaZ0jg0BdRcTF3yotzsDk5IA= - - Base.lproj/Main.storyboardc/Info.plist - - xbKSeo7ifHJ5lnOkPd7IgZ3qsA4= - - Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/objects-11.0+.nib - - J4L+MpzBcSnsEvFpKkQCwJRwhr4= - - Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/runtime.nib - - pDhMJHpLQMtKJmx4xMveqi7kpvQ= - - Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/objects-11.0+.nib - - nuJDK6jtv5sGYUr4jf4EmLQ4PtY= - - Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/runtime.nib - - ft2JYpaEbwyqn8UX02ntmhIt/i8= - - Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/objects-11.0+.nib - - 5I/VNyg/7rlqM2LpMf6ZQqY6Th0= - - Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/runtime.nib - - ed9M6FGOzQ/C7mlxOcF7QW5KZ1I= - - Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/objects-11.0+.nib - - NC5ifMZeQC4P/5JVt+eik1XQYVY= - - Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/runtime.nib - - bLpYrQ9FjDxcogw32CP/06dPhvA= - - Frameworks/libswiftCore.dylib - - rUCFys+AWOss+EWBCEaOAdpVX20= - - Frameworks/libswiftCoreFoundation.dylib - - jbz8bbI4t9dRPuKdA8ZNhNXyo0U= - - Frameworks/libswiftCoreGraphics.dylib - - huTIMrZ/kA9A9Tt76byI5EBXS/U= - - Frameworks/libswiftCoreImage.dylib - - Wu1YkAmxP7mstnopw5nN9sXGCIE= - - Frameworks/libswiftDarwin.dylib - - HfrGp9Y0cL2SCmQ+awrpNSMGANA= - - Frameworks/libswiftDispatch.dylib - - aadtyAmEfkIdYfh81AwgW+NUUlY= - - Frameworks/libswiftFoundation.dylib - - KDSxmmBbVm/BCHhB5OnzmK4VXk4= - - Frameworks/libswiftMetal.dylib - - TV0+UepDX7RtCIx7UJBbFxaK8wA= - - Frameworks/libswiftObjectiveC.dylib - - 99VfCrz1VAs+mYzEBYpEDprb2gk= - - Frameworks/libswiftQuartzCore.dylib - - hhpGzWzg7Xz2I6HFQLT5M+dryRA= - - Frameworks/libswiftUIKit.dylib - - YLcEdnA1g3YssJbn8B2WVNm0X3A= - - Frameworks/libswiftos.dylib - - hQVrRh/sl7ae3Ihai9e/V8V2zKQ= - - Info.plist - - GnfynkmsYg7oZ1RiwyRp07+MGl4= - - PkgInfo - - n57qDP4tZfLD1rCS43W0B4LQjzE= - - libswiftRemoteMirror.dylib - - RcicIP0lKALIvOAuOlDdMvzAUTU= - - - files2 - - Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - - hash - - dW6/EMGCij2QRRne+ltAQC811Qg= - - hash2 - - 2LfXO1azFKgHX/O5y7Cs/QTv5rJJO1qBW1OkNX6uvgQ= - - - Base.lproj/LaunchScreen.storyboardc/Info.plist - - hash - - n2t8gsDpfE6XkhG31p7IQJRxTxU= - - hash2 - - HyVdXMU7Ux4/KalAao30mpWOK/lEPT4gvYN09wf31cg= - - - Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - - hash - - M2zpq4mZX7KX/nYXCI3iXA/UJMo= - - hash2 - - 03CJY4V84Vrz5eKo2tzsMXfpwu0BzeGJ3TKxUfQvLlA= - - - Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/objects-11.0+.nib - - hash - - kdCSGdBzWn6VnflnUVjaLW3XI8o= - - hash2 - - aGmBzulliaTAdrATJ8Yklw1rhMBcpp3DK+Yfq4BtwbI= - - - Base.lproj/Main.storyboardc/7ox-Dw-FT2-view-b2c-Uo-fOB.nib/runtime.nib - - hash - - lxGbCIPdFAVkSn0Vbf54hR8gQTM= - - hash2 - - 08UNuZBe+6j43LInc0CzKrM1hnK73YmR+71+/3xMJFU= - - - Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/objects-11.0+.nib - - hash - - c/L5WNJBB66ZOdUwDkp2G81V7QI= - - hash2 - - L+Z2n9I38/Tts5Yq37Lw05knBGUzltXkgBL88IGr0fQ= - - - Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/runtime.nib - - hash - - BOCXaZ0jg0BdRcTF3yotzsDk5IA= - - hash2 - - KxlsebGIkjfdTL9ZxPrhdh429qaSu4rPQVUo137TAHI= - - - Base.lproj/Main.storyboardc/Info.plist - - hash - - xbKSeo7ifHJ5lnOkPd7IgZ3qsA4= - - hash2 - - XCMwVLFbed+/whlcjyanNWWkOnvI830DipkvBbJE5no= - - - Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/objects-11.0+.nib - - hash - - J4L+MpzBcSnsEvFpKkQCwJRwhr4= - - hash2 - - BUDFnaBWA7YV3D5p63o6h2QYXj+t2mYR3RdCzjjSf6o= - - - Base.lproj/Main.storyboardc/UINavigationController-56p-VW-Fs0.nib/runtime.nib - - hash - - pDhMJHpLQMtKJmx4xMveqi7kpvQ= - - hash2 - - tvxFEp66Le6Z0r2hI4ALrelp5H7s+IXCa2L1nFS1+5g= - - - Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/objects-11.0+.nib - - hash - - nuJDK6jtv5sGYUr4jf4EmLQ4PtY= - - hash2 - - lYNWVtOoKexlqp7BwJyzajnMbAigQ+0t8jJ1OaRYGKQ= - - - Base.lproj/Main.storyboardc/UIViewController-BYZ-38-t0r.nib/runtime.nib - - hash - - ft2JYpaEbwyqn8UX02ntmhIt/i8= - - hash2 - - FfKVTH25L/wRRkrrMGmzwfDtQt9729PGvyzFFyPsJUY= - - - Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/objects-11.0+.nib - - hash - - 5I/VNyg/7rlqM2LpMf6ZQqY6Th0= - - hash2 - - RSGvAkqBHTweAmTGZM3XKTLTXCnWE6pFIxEcmZx+mnk= - - - Base.lproj/Main.storyboardc/UIViewController-fJi-Vl-h77.nib/runtime.nib - - hash - - ed9M6FGOzQ/C7mlxOcF7QW5KZ1I= - - hash2 - - HghkUBcJkZudoCXO8u0slF5Iyr7MkFfaU6YYyasCQYg= - - - Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/objects-11.0+.nib - - hash - - NC5ifMZeQC4P/5JVt+eik1XQYVY= - - hash2 - - eQm15tDaBRMJU91Er816mLyST4r5TatG8YuiwcGwORY= - - - Base.lproj/Main.storyboardc/fJi-Vl-h77-view-ws3-eo-fxB.nib/runtime.nib - - hash - - bLpYrQ9FjDxcogw32CP/06dPhvA= - - hash2 - - 4rXsfy3OxYt9yIwS9lQ24cljTUnMjr9JIV282bDOwZ0= - - - Frameworks/libswiftCore.dylib - - hash - - rUCFys+AWOss+EWBCEaOAdpVX20= - - hash2 - - 5c45AY8E34APUJ02LozOtR2igenlBK08vCPlUThxyHc= - - - Frameworks/libswiftCoreFoundation.dylib - - hash - - jbz8bbI4t9dRPuKdA8ZNhNXyo0U= - - hash2 - - XutxDO/xfAJnQNuq6JnEePNfiUQ8U/ryfBXX2psc4B8= - - - Frameworks/libswiftCoreGraphics.dylib - - hash - - huTIMrZ/kA9A9Tt76byI5EBXS/U= - - hash2 - - bY5S/mHiwL6FnLuXRcPqkKGoZ7qULKNnxsEA9kM625k= - - - Frameworks/libswiftCoreImage.dylib - - hash - - Wu1YkAmxP7mstnopw5nN9sXGCIE= - - hash2 - - mC7BoHtfzGO5nMfKqXh+X9GRssaU7iDBxvx3RagVIq8= - - - Frameworks/libswiftDarwin.dylib - - hash - - HfrGp9Y0cL2SCmQ+awrpNSMGANA= - - hash2 - - VgKoc5SgoJfjPo7PE/q2hS0+TaEuN4g2OUajV0ymBEo= - - - Frameworks/libswiftDispatch.dylib - - hash - - aadtyAmEfkIdYfh81AwgW+NUUlY= - - hash2 - - xMGfLQyCyS4eOkvKlq0r05kE2eu1YO4XXq1Q7/GT+/Y= - - - Frameworks/libswiftFoundation.dylib - - hash - - KDSxmmBbVm/BCHhB5OnzmK4VXk4= - - hash2 - - E5T6Vbdthahjlf9G95yptQ02WMqndCwMAnhE96KhhMk= - - - Frameworks/libswiftMetal.dylib - - hash - - TV0+UepDX7RtCIx7UJBbFxaK8wA= - - hash2 - - gKLRRIYwql9Su1SCvRbBxbUjfODveR6pgItl9hUvqOI= - - - Frameworks/libswiftObjectiveC.dylib - - hash - - 99VfCrz1VAs+mYzEBYpEDprb2gk= - - hash2 - - zizfRBOJvZce/ijXvRKaB6HQviolXYn+VCzubjxR9XM= - - - Frameworks/libswiftQuartzCore.dylib - - hash - - hhpGzWzg7Xz2I6HFQLT5M+dryRA= - - hash2 - - 8H1/KFcZfdb11FVsUdnlOOEAYrpcFiAJW1Jx5EadV8U= - - - Frameworks/libswiftUIKit.dylib - - hash - - YLcEdnA1g3YssJbn8B2WVNm0X3A= - - hash2 - - +wsxu+pKAFkwHd2n1kcJwqB2Kz39qUP5vh20y/nGies= - - - Frameworks/libswiftos.dylib - - hash - - hQVrRh/sl7ae3Ihai9e/V8V2zKQ= - - hash2 - - UUaqIgGhrYsBoJKQNjneHQu4j4eYgCbPAUQ/p7f+NQo= - - - libswiftRemoteMirror.dylib - - hash - - RcicIP0lKALIvOAuOlDdMvzAUTU= - - hash2 - - pNGoc8Omi1Q7fyo3tX9f9QQD+3bPNkeRj0/N1hb+Cmw= - - - - rules - - ^ - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^ - - weight - 20 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/libswiftRemoteMirror.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/libswiftRemoteMirror.dylib deleted file mode 100755 index 4b9f774a1..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/libswiftRemoteMirror.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/sample-app b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/sample-app deleted file mode 100755 index 5bf7548df..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-app.app/sample-app and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/Info.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/Info.plist deleted file mode 100644 index c768484ca..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/Info.plist and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/XCTAutomationSupport b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/XCTAutomationSupport deleted file mode 100755 index 7c84c7787..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/XCTAutomationSupport and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/_CodeSignature/CodeResources b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/_CodeSignature/CodeResources deleted file mode 100644 index cfa9942c6..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/_CodeSignature/CodeResources +++ /dev/null @@ -1,136 +0,0 @@ - - - - - files - - Info.plist - - sNzY3Sa/tiwF8YD3qNGhy4xzXzw= - - version.plist - - tqIAxSzNYfdxtnMPZFYj3CkoM94= - - - files2 - - version.plist - - hash - - tqIAxSzNYfdxtnMPZFYj3CkoM94= - - hash2 - - vZtTCcALD/lhBLz+nE9AaZOJ6HRuLwq4RyMhBk/UWw8= - - - - rules - - ^ - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^ - - weight - 20 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/version.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/version.plist deleted file mode 100644 index 9dc861702..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTAutomationSupport.framework/version.plist +++ /dev/null @@ -1,18 +0,0 @@ - - - - - BuildAliasOf - XCTest - BuildVersion - 1 - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - ProjectName - XCTest_Sim - SourceVersion - 13764000000000000 - - diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/Info.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/Info.plist deleted file mode 100644 index bba4a0b4b..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/Info.plist and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/XCTest b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/XCTest deleted file mode 100755 index 6dadd54e0..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/XCTest and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/_CodeSignature/CodeResources b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/_CodeSignature/CodeResources deleted file mode 100644 index 48baed4c7..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/_CodeSignature/CodeResources +++ /dev/null @@ -1,803 +0,0 @@ - - - - - files - - Headers/XCAbstractTest.h - - 4jnRu9kM4nMP+Xh3ikwmHuBDxsI= - - Headers/XCTActivity.h - - BVKd+CuVL/fMWVnojVTY7BZiXkc= - - Headers/XCTAttachment.h - - D+igalTdqMWvG/cB1056ns8u3B8= - - Headers/XCTAttachmentLifetime.h - - Qi0F8Z3qRbkbVrjHzxpLaMrHT+k= - - Headers/XCTContext.h - - S2c/fkq5xnjLgsMY3mNIE7jPMFE= - - Headers/XCTDarwinNotificationExpectation.h - - T1bfewH+fYADesmaBVQWzTdVRjk= - - Headers/XCTKVOExpectation.h - - s28+hglUCU24y2eMlji4++ZVC+0= - - Headers/XCTNSNotificationExpectation.h - - ZC9t23DBiU7y/pJ116Zgt8q1/J4= - - Headers/XCTNSPredicateExpectation.h - - ZeWBK1Un0h29h5DRuqDXCiqCOnk= - - Headers/XCTWaiter.h - - 3xRcrUqW54PHl7VXGv1RNSfgZAg= - - Headers/XCTest.apinotes - - WqUywzmEAqoV6c0qeOnMA2dcIQc= - - Headers/XCTest.h - - vyHRJ5iIHDimvUMhPRtMJzhrlW4= - - Headers/XCTestAssertions.h - - t430vwqgq3wiAocVV386i0N+lOY= - - Headers/XCTestAssertionsImpl.h - - ZbDVHohdSHIPtEqmg7zN34qa0T4= - - Headers/XCTestCase+AsynchronousTesting.h - - eC80b6p4MAnn/amp9qgAOF/JnyY= - - Headers/XCTestCase.h - - 7cm+qMjwhWmKgQWOex4Hjcc2jvs= - - Headers/XCTestCaseRun.h - - /XUqDHA/BFdQDUxQU8Ft5LXo/Ps= - - Headers/XCTestDefines.h - - wgEh+arKAaJ2OX5pBm7Hh3ft0jY= - - Headers/XCTestErrors.h - - oZFqJmcKHuKZIgeKOwsFDxhfEEc= - - Headers/XCTestExpectation.h - - Y/ssvPOSAIHfa/G1pVREFYwgDq8= - - Headers/XCTestLog.h - - 9BU/gwbaKcfn2L9dfo2dHRFN6Bc= - - Headers/XCTestObservation.h - - 24hjfD82jAN7/PhxU8RiEWTo5gs= - - Headers/XCTestObservationCenter.h - - 5ySsNYFGF0ZFvLZnL7UTg1HNRR4= - - Headers/XCTestObserver.h - - DV3Cjdd1CAe6nYFEzmUrCtnzxQg= - - Headers/XCTestProbe.h - - fIVR0xRsxMAabrJmeGX3hPDwL0Y= - - Headers/XCTestRun.h - - 7GVNxTeghh0aBxY/Gvb+j2VTkqQ= - - Headers/XCTestSuite.h - - eRc+OVrMoZSKfP/hWkP9044Xkwo= - - Headers/XCTestSuiteRun.h - - OX+g52bOAnhjLVDKkweTKM8jTHQ= - - Headers/XCUIApplication.h - - 3xPGyAQELvSZZ4RHMwhQEnlzFhg= - - Headers/XCUICoordinate.h - - ISpzcCIN+bNtcvHSlqKq3H0dHAA= - - Headers/XCUIDevice.h - - 6pJZzs6nb9PxIhPZMSzM3Pnoyyk= - - Headers/XCUIElement.h - - csedByP43miIpAyfC8qT1PdhfSU= - - Headers/XCUIElementAttributes.h - - kWitRD0ClLa1hUvctZ6Jw2DmOW8= - - Headers/XCUIElementQuery.h - - C3ZXTnkZIFu38bImb5YnKX8ME3s= - - Headers/XCUIElementTypeQueryProvider.h - - RByqnqCJz+rOh+n5b6A0LWE4ipY= - - Headers/XCUIElementTypes.h - - r6naN5HO1+6krqDyXc3YqPmLBgw= - - Headers/XCUIKeyboardKeys.h - - N6DDr++AC3URGk9/PoyCGpq5h9k= - - Headers/XCUIRemote.h - - +rbCM60bDizOcqH+NaoTiCwtEH4= - - Headers/XCUIScreen.h - - /ub1WB6+9GFwYxGEGsIzKvyt/mg= - - Headers/XCUIScreenshot.h - - WRAFpS5fsJOjpa68uJDYY7QcwzQ= - - Headers/XCUIScreenshotProviding.h - - qghz8l697gauRG1WZGkXCsisS40= - - Headers/XCUISiriService.h - - NtIeUU61kDhd8LGgBr1FjKXe6JQ= - - Info.plist - - CYfyvPIGUR84QvCD7SuNDvG6Bxc= - - Modules/module.modulemap - - ha0qqLvU0UdkLu07qH5tE4agQV4= - - en.lproj/InfoPlist.strings - - hash - - TuBj57ZP6zBqcL9HttO2Rucaw9E= - - optional - - - version.plist - - Etc/8BPenX54rv1uBx24u4bnqTg= - - - files2 - - Headers/XCAbstractTest.h - - hash - - 4jnRu9kM4nMP+Xh3ikwmHuBDxsI= - - hash2 - - IFgW59C1Ktqp4LtLT30sw91amGbNOGweE+JfCOD3+Zg= - - - Headers/XCTActivity.h - - hash - - BVKd+CuVL/fMWVnojVTY7BZiXkc= - - hash2 - - rRcgcNhfkv8++PLGoc2+V7RKA+20od2gktcAZnNphso= - - - Headers/XCTAttachment.h - - hash - - D+igalTdqMWvG/cB1056ns8u3B8= - - hash2 - - 5aviQX7pgXyeS3UISWFOjiiUf8kPCzFtPNnk08B2rrQ= - - - Headers/XCTAttachmentLifetime.h - - hash - - Qi0F8Z3qRbkbVrjHzxpLaMrHT+k= - - hash2 - - Rgc8y3HDwwo+o1r5F3cM/Qx1oWjHjCU7NM42hjfXSas= - - - Headers/XCTContext.h - - hash - - S2c/fkq5xnjLgsMY3mNIE7jPMFE= - - hash2 - - aKMqn4OBmb2Fg3/8sTMLXW2eHWiyWP3bQkSzTnvrwmQ= - - - Headers/XCTDarwinNotificationExpectation.h - - hash - - T1bfewH+fYADesmaBVQWzTdVRjk= - - hash2 - - yghcN+Vtx2KfRi9uMiorSiMSUWkgipo2aBxjXGpindM= - - - Headers/XCTKVOExpectation.h - - hash - - s28+hglUCU24y2eMlji4++ZVC+0= - - hash2 - - s24Kr8S1fbS62TmPjWUVYBWo7l0mxOge/yAw3RVvRCQ= - - - Headers/XCTNSNotificationExpectation.h - - hash - - ZC9t23DBiU7y/pJ116Zgt8q1/J4= - - hash2 - - vHwq0rw8c1B93uSPcxyrdcpNF6gp5UqVvnMHKFPMSMg= - - - Headers/XCTNSPredicateExpectation.h - - hash - - ZeWBK1Un0h29h5DRuqDXCiqCOnk= - - hash2 - - S1UvUDqqEddmWd/HrxA/x6Hc5VP0fYA6PWhhbAX9PzY= - - - Headers/XCTWaiter.h - - hash - - 3xRcrUqW54PHl7VXGv1RNSfgZAg= - - hash2 - - mA5vx6/QQ25gHCNLjo9Y0eX1khy7s52IB7yacIGlrNk= - - - Headers/XCTest.apinotes - - hash - - WqUywzmEAqoV6c0qeOnMA2dcIQc= - - hash2 - - k+5JrEIKeIUahHN4rMRX6ihL13259MqcP597ms2vgMs= - - - Headers/XCTest.h - - hash - - vyHRJ5iIHDimvUMhPRtMJzhrlW4= - - hash2 - - vq64eNbcQBW4F9zCLXsPBM4vawf51Eq6PcVMcSyxLYI= - - - Headers/XCTestAssertions.h - - hash - - t430vwqgq3wiAocVV386i0N+lOY= - - hash2 - - pGvrq4y/YqWUdlF2m6LpdEp5xPWAw5OzuiryWTlaF3I= - - - Headers/XCTestAssertionsImpl.h - - hash - - ZbDVHohdSHIPtEqmg7zN34qa0T4= - - hash2 - - RxajF3uw62Qphc/Icq0LxEM3ocmdcEbdthtDn0ABR2k= - - - Headers/XCTestCase+AsynchronousTesting.h - - hash - - eC80b6p4MAnn/amp9qgAOF/JnyY= - - hash2 - - PzPy8zgUJIK7pNLJsyp30K6scvvanQ/gT1BRn5HqHcs= - - - Headers/XCTestCase.h - - hash - - 7cm+qMjwhWmKgQWOex4Hjcc2jvs= - - hash2 - - zx/f5HefeE/H6XdzU8PNfu+tq/NcLHXaLOQxIRbQA9E= - - - Headers/XCTestCaseRun.h - - hash - - /XUqDHA/BFdQDUxQU8Ft5LXo/Ps= - - hash2 - - jEzXeXeFAbT7xbfbqjlf4yF+lZvOKKw9u0dhT8Lzpe4= - - - Headers/XCTestDefines.h - - hash - - wgEh+arKAaJ2OX5pBm7Hh3ft0jY= - - hash2 - - 7He5KYZ39XMWqYjNErsv62IkR5nkHxwPpq6rh4W8tho= - - - Headers/XCTestErrors.h - - hash - - oZFqJmcKHuKZIgeKOwsFDxhfEEc= - - hash2 - - bqmU7PnCm6GkYigcYehsZluZJau/3nfvDl9NneLn8NI= - - - Headers/XCTestExpectation.h - - hash - - Y/ssvPOSAIHfa/G1pVREFYwgDq8= - - hash2 - - bzHkvrq2f+1FFP3qie5fF78p6scQOnD/r7WYoDW764A= - - - Headers/XCTestLog.h - - hash - - 9BU/gwbaKcfn2L9dfo2dHRFN6Bc= - - hash2 - - Tu+6JYZZzftcXmUWH11IO9/jXCXi6QPeWDrL6izup6s= - - - Headers/XCTestObservation.h - - hash - - 24hjfD82jAN7/PhxU8RiEWTo5gs= - - hash2 - - bZQGOpPj/qLs1snCfbJDBnIeMfcP2Bs5EhkID+1qmjM= - - - Headers/XCTestObservationCenter.h - - hash - - 5ySsNYFGF0ZFvLZnL7UTg1HNRR4= - - hash2 - - d+hY4S23zmWO8E2YIrh4biGe9oQWCfD497a+oVk2+yY= - - - Headers/XCTestObserver.h - - hash - - DV3Cjdd1CAe6nYFEzmUrCtnzxQg= - - hash2 - - 7CTdhCJbuEzQNSyp3exgcCn6JnIRjBwpUcOKmiddBtU= - - - Headers/XCTestProbe.h - - hash - - fIVR0xRsxMAabrJmeGX3hPDwL0Y= - - hash2 - - FKXb32Ennc+6f3SkuVdo8bBNcIIWwryV5u5FmQYN8Fc= - - - Headers/XCTestRun.h - - hash - - 7GVNxTeghh0aBxY/Gvb+j2VTkqQ= - - hash2 - - bSeEEos9toHX4ZeMGeRYdv1KXdCziExa2r95Y6Qcem8= - - - Headers/XCTestSuite.h - - hash - - eRc+OVrMoZSKfP/hWkP9044Xkwo= - - hash2 - - L7lrx0/vT/6C441YiHqyBo8c41P7nh8AVfj2Ju9MWF0= - - - Headers/XCTestSuiteRun.h - - hash - - OX+g52bOAnhjLVDKkweTKM8jTHQ= - - hash2 - - QDxhlFfxAJEcudV29W9M96FJW5LQiR0yqdUHzkjMuA0= - - - Headers/XCUIApplication.h - - hash - - 3xPGyAQELvSZZ4RHMwhQEnlzFhg= - - hash2 - - c5JhLgu1HF3BRKMZa+lW3Uv/rhC85w7hROiHmgBDw8k= - - - Headers/XCUICoordinate.h - - hash - - ISpzcCIN+bNtcvHSlqKq3H0dHAA= - - hash2 - - WqIHIIX29PruSt0Ux3ajf2d2Ya6W7ES85APt7RfZEUQ= - - - Headers/XCUIDevice.h - - hash - - 6pJZzs6nb9PxIhPZMSzM3Pnoyyk= - - hash2 - - a332EuTW+1XyYOs10oV/xXmV18ua86gJqI6rQ/QIzJE= - - - Headers/XCUIElement.h - - hash - - csedByP43miIpAyfC8qT1PdhfSU= - - hash2 - - V5BgoHx/+zYmB/DYMS6sZXiTe4L2VJ64K0C1hLijWz4= - - - Headers/XCUIElementAttributes.h - - hash - - kWitRD0ClLa1hUvctZ6Jw2DmOW8= - - hash2 - - 9SI2mH0Fw8cgcd7e5L+9MJCRlhcVP03/Kb6JOrmb4DA= - - - Headers/XCUIElementQuery.h - - hash - - C3ZXTnkZIFu38bImb5YnKX8ME3s= - - hash2 - - LF3E68WtedEEM/IFD3q/tOZ3q0JtUQQhOK4XkamNjNM= - - - Headers/XCUIElementTypeQueryProvider.h - - hash - - RByqnqCJz+rOh+n5b6A0LWE4ipY= - - hash2 - - KPNzI8l6orkq7Lw9Lptey1l4nsXuyg/c9kYgH2/O5x0= - - - Headers/XCUIElementTypes.h - - hash - - r6naN5HO1+6krqDyXc3YqPmLBgw= - - hash2 - - lNOZzyQsfsLBbC8dqjRVWHvvLPL9n0H8lUWk7b6F+40= - - - Headers/XCUIKeyboardKeys.h - - hash - - N6DDr++AC3URGk9/PoyCGpq5h9k= - - hash2 - - I3lWDagvmkuZkcnrVsBHIjUOWuoNmCqRIDZL/NV1Cow= - - - Headers/XCUIRemote.h - - hash - - +rbCM60bDizOcqH+NaoTiCwtEH4= - - hash2 - - w7DXRAekwdX2XMbVLAxEj/q2faSvgp1LMbKGZDcUznE= - - - Headers/XCUIScreen.h - - hash - - /ub1WB6+9GFwYxGEGsIzKvyt/mg= - - hash2 - - DXvaY/5E2v8cBTldGVecRYgu32hr9r4pm3DHS2nDjfw= - - - Headers/XCUIScreenshot.h - - hash - - WRAFpS5fsJOjpa68uJDYY7QcwzQ= - - hash2 - - F2tCZijPx0hU+7CIdW0fMZK4cwKbgFYiI9LKYINt5sU= - - - Headers/XCUIScreenshotProviding.h - - hash - - qghz8l697gauRG1WZGkXCsisS40= - - hash2 - - s35VI6Lzy6LUDsIoANQTenLSsJeaPXvonWElqk8cJbM= - - - Headers/XCUISiriService.h - - hash - - NtIeUU61kDhd8LGgBr1FjKXe6JQ= - - hash2 - - 6JTR/e2zA54rVmT1cblklOkL8LFXaYg81YGhVhoagsw= - - - Modules/module.modulemap - - hash - - ha0qqLvU0UdkLu07qH5tE4agQV4= - - hash2 - - w5Zd8voFpYyDVfx4t9/bCAZAs1kTrhmGSzTXQMiBd/c= - - - en.lproj/InfoPlist.strings - - hash - - TuBj57ZP6zBqcL9HttO2Rucaw9E= - - hash2 - - 89RGkjZaKuewYnjpzwhIswhqfrU8+pcEXqM/DHVrUmo= - - optional - - - version.plist - - hash - - Etc/8BPenX54rv1uBx24u4bnqTg= - - hash2 - - Jh5i9giCFfo5GhN25CjMKdDJ6Kdlz/p4L95RITR+WeA= - - - - rules - - ^ - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^ - - weight - 20 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/en.lproj/InfoPlist.strings b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/en.lproj/InfoPlist.strings deleted file mode 100644 index d64468760..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/en.lproj/InfoPlist.strings and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/version.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/version.plist deleted file mode 100644 index 22f4aa327..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Frameworks/XCTest.framework/version.plist +++ /dev/null @@ -1,18 +0,0 @@ - - - - - BuildAliasOf - XCTest - BuildVersion - 1 - CFBundleShortVersionString - 1.0 - CFBundleVersion - 13764 - ProjectName - XCTest_Sim - SourceVersion - 13764000000000000 - - diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Info.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Info.plist deleted file mode 100644 index 5f8b3d726..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/Info.plist +++ /dev/null @@ -1,81 +0,0 @@ - - - - - BuildMachineOSBuild - 17C43 - CFBundleAllowMixedLocalizations - - CFBundleDevelopmentRegion - en - CFBundleExecutable - sample-appUITests-Runner - CFBundleIdentifier - com.apple.test.sample-appUITests-Runner - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - sample-appUITests-Runner - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - iPhoneSimulator - - CFBundleVersion - 1 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 15C89a - DTPlatformName - iphonesimulator - DTPlatformVersion - 11.2 - DTSDKBuild - 15C89a - DTSDKName - iphonesimulator11.2 - DTXcode - 0920 - DTXcodeBuild - 9C34c - LSRequiresIPhoneOS - - MinimumOSVersion - 8.0 - UIBackgroundModes - - unboundedTaskCompletion - continuous - - UIDeviceFamily - - 1 - 2 - - UIRequiredDeviceCapabilities - - armv7 - - UIRequiresFullScreen - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PkgInfo b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PkgInfo deleted file mode 100644 index bd04210fb..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCore.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCore.dylib deleted file mode 100755 index c8856ca1c..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCore.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreAudio.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreAudio.dylib deleted file mode 100755 index 77665d7d9..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreAudio.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreFoundation.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreFoundation.dylib deleted file mode 100755 index 8331f4e39..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreFoundation.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreGraphics.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreGraphics.dylib deleted file mode 100755 index 01e7f34fd..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreGraphics.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreImage.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreImage.dylib deleted file mode 100755 index 79b600200..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreImage.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreMedia.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreMedia.dylib deleted file mode 100755 index 32104bef9..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftCoreMedia.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftDarwin.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftDarwin.dylib deleted file mode 100755 index 27683799f..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftDarwin.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftDispatch.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftDispatch.dylib deleted file mode 100755 index ebcbf3ec0..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftDispatch.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftFoundation.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftFoundation.dylib deleted file mode 100755 index 2813d602b..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftFoundation.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftMetal.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftMetal.dylib deleted file mode 100755 index 1f0f24906..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftMetal.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftObjectiveC.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftObjectiveC.dylib deleted file mode 100755 index 3d5295d8c..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftObjectiveC.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftQuartzCore.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftQuartzCore.dylib deleted file mode 100755 index b3e7e355b..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftQuartzCore.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftUIKit.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftUIKit.dylib deleted file mode 100755 index 6bbd4a45c..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftUIKit.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftXCTest.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftXCTest.dylib deleted file mode 100755 index be02dea08..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftXCTest.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftos.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftos.dylib deleted file mode 100755 index 04c4ac367..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Frameworks/libswiftos.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Info.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Info.plist deleted file mode 100644 index 695476a03..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/Info.plist and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/_CodeSignature/CodeResources b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/_CodeSignature/CodeResources deleted file mode 100644 index 3d8a15ac7..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/_CodeSignature/CodeResources +++ /dev/null @@ -1,361 +0,0 @@ - - - - - files - - Frameworks/libswiftCore.dylib - - rUCFys+AWOss+EWBCEaOAdpVX20= - - Frameworks/libswiftCoreAudio.dylib - - YCR3BEzP4YKaivbFZEVICDAmC8o= - - Frameworks/libswiftCoreFoundation.dylib - - jbz8bbI4t9dRPuKdA8ZNhNXyo0U= - - Frameworks/libswiftCoreGraphics.dylib - - huTIMrZ/kA9A9Tt76byI5EBXS/U= - - Frameworks/libswiftCoreImage.dylib - - Wu1YkAmxP7mstnopw5nN9sXGCIE= - - Frameworks/libswiftCoreMedia.dylib - - VvUyrtJ3d89KeGj/aUUYVXiyVkg= - - Frameworks/libswiftDarwin.dylib - - HfrGp9Y0cL2SCmQ+awrpNSMGANA= - - Frameworks/libswiftDispatch.dylib - - aadtyAmEfkIdYfh81AwgW+NUUlY= - - Frameworks/libswiftFoundation.dylib - - KDSxmmBbVm/BCHhB5OnzmK4VXk4= - - Frameworks/libswiftMetal.dylib - - TV0+UepDX7RtCIx7UJBbFxaK8wA= - - Frameworks/libswiftObjectiveC.dylib - - 99VfCrz1VAs+mYzEBYpEDprb2gk= - - Frameworks/libswiftQuartzCore.dylib - - hhpGzWzg7Xz2I6HFQLT5M+dryRA= - - Frameworks/libswiftUIKit.dylib - - YLcEdnA1g3YssJbn8B2WVNm0X3A= - - Frameworks/libswiftXCTest.dylib - - mspOKPXUtyrqB8UO/HrlxDY0QuY= - - Frameworks/libswiftos.dylib - - hQVrRh/sl7ae3Ihai9e/V8V2zKQ= - - Info.plist - - pZszF9Atj5g05ELtyuzXVx5QqDU= - - libswiftRemoteMirror.dylib - - RcicIP0lKALIvOAuOlDdMvzAUTU= - - - files2 - - Frameworks/libswiftCore.dylib - - hash - - rUCFys+AWOss+EWBCEaOAdpVX20= - - hash2 - - 5c45AY8E34APUJ02LozOtR2igenlBK08vCPlUThxyHc= - - - Frameworks/libswiftCoreAudio.dylib - - hash - - YCR3BEzP4YKaivbFZEVICDAmC8o= - - hash2 - - RWVQr48nDDFGfi8S6jjU2qSQodv8L2Qh/Eu2/2h5tgk= - - - Frameworks/libswiftCoreFoundation.dylib - - hash - - jbz8bbI4t9dRPuKdA8ZNhNXyo0U= - - hash2 - - XutxDO/xfAJnQNuq6JnEePNfiUQ8U/ryfBXX2psc4B8= - - - Frameworks/libswiftCoreGraphics.dylib - - hash - - huTIMrZ/kA9A9Tt76byI5EBXS/U= - - hash2 - - bY5S/mHiwL6FnLuXRcPqkKGoZ7qULKNnxsEA9kM625k= - - - Frameworks/libswiftCoreImage.dylib - - hash - - Wu1YkAmxP7mstnopw5nN9sXGCIE= - - hash2 - - mC7BoHtfzGO5nMfKqXh+X9GRssaU7iDBxvx3RagVIq8= - - - Frameworks/libswiftCoreMedia.dylib - - hash - - VvUyrtJ3d89KeGj/aUUYVXiyVkg= - - hash2 - - eHYHT+dsYLHUiYYNYGQ7LBxlon+ubK0xF0sQYCj1Q9Q= - - - Frameworks/libswiftDarwin.dylib - - hash - - HfrGp9Y0cL2SCmQ+awrpNSMGANA= - - hash2 - - VgKoc5SgoJfjPo7PE/q2hS0+TaEuN4g2OUajV0ymBEo= - - - Frameworks/libswiftDispatch.dylib - - hash - - aadtyAmEfkIdYfh81AwgW+NUUlY= - - hash2 - - xMGfLQyCyS4eOkvKlq0r05kE2eu1YO4XXq1Q7/GT+/Y= - - - Frameworks/libswiftFoundation.dylib - - hash - - KDSxmmBbVm/BCHhB5OnzmK4VXk4= - - hash2 - - E5T6Vbdthahjlf9G95yptQ02WMqndCwMAnhE96KhhMk= - - - Frameworks/libswiftMetal.dylib - - hash - - TV0+UepDX7RtCIx7UJBbFxaK8wA= - - hash2 - - gKLRRIYwql9Su1SCvRbBxbUjfODveR6pgItl9hUvqOI= - - - Frameworks/libswiftObjectiveC.dylib - - hash - - 99VfCrz1VAs+mYzEBYpEDprb2gk= - - hash2 - - zizfRBOJvZce/ijXvRKaB6HQviolXYn+VCzubjxR9XM= - - - Frameworks/libswiftQuartzCore.dylib - - hash - - hhpGzWzg7Xz2I6HFQLT5M+dryRA= - - hash2 - - 8H1/KFcZfdb11FVsUdnlOOEAYrpcFiAJW1Jx5EadV8U= - - - Frameworks/libswiftUIKit.dylib - - hash - - YLcEdnA1g3YssJbn8B2WVNm0X3A= - - hash2 - - +wsxu+pKAFkwHd2n1kcJwqB2Kz39qUP5vh20y/nGies= - - - Frameworks/libswiftXCTest.dylib - - hash - - mspOKPXUtyrqB8UO/HrlxDY0QuY= - - hash2 - - fefqgwyU7HpHyBCDmlOTgpilRXVCfFFYkNAf6Ih7CoQ= - - - Frameworks/libswiftos.dylib - - hash - - hQVrRh/sl7ae3Ihai9e/V8V2zKQ= - - hash2 - - UUaqIgGhrYsBoJKQNjneHQu4j4eYgCbPAUQ/p7f+NQo= - - - libswiftRemoteMirror.dylib - - hash - - RcicIP0lKALIvOAuOlDdMvzAUTU= - - hash2 - - pNGoc8Omi1Q7fyo3tX9f9QQD+3bPNkeRj0/N1hb+Cmw= - - - - rules - - ^ - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^ - - weight - 20 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/libswiftRemoteMirror.dylib b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/libswiftRemoteMirror.dylib deleted file mode 100755 index 4b9f774a1..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/libswiftRemoteMirror.dylib and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/sample-appUITests b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/sample-appUITests deleted file mode 100755 index dd7f73ab8..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest/sample-appUITests and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/sample-appUITests-Runner b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/sample-appUITests-Runner deleted file mode 100755 index 3c6c2415a..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample-appUITests-Runner.app/sample-appUITests-Runner and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_app.swiftmodule/x86_64.swiftdoc b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_app.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 4885615fc..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_app.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_app.swiftmodule/x86_64.swiftmodule b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_app.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index b1e5a3504..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_app.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_appUITests.swiftmodule/x86_64.swiftdoc b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_appUITests.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 4885615fc..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_appUITests.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_appUITests.swiftmodule/x86_64.swiftmodule b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_appUITests.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 2e60c0211..000000000 Binary files a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator/sample_appUITests.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/UITesting_iphonesimulator11.2-x86_64.xctestrun b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/UITesting_iphonesimulator11.2-x86_64.xctestrun deleted file mode 100644 index 6032a4cc5..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/UITesting_iphonesimulator11.2-x86_64.xctestrun +++ /dev/null @@ -1,79 +0,0 @@ - - - - - sample-appUITests - - BundleIdentifiersForCrashReportEmphasis - - com.agoda.sample-app - com.agoga.sample-appUITests - - CommandLineArguments - - DependentProductPaths - - __TESTROOT__/Debug-iphonesimulator/sample-app.app - __TESTROOT__/Debug-iphonesimulator/sample-appUITests-Runner.app/PlugIns/sample-appUITests.xctest - - EnvironmentVariables - - DYLD_FRAMEWORK_PATH - /Users/ypanforov/Developer/marathon/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator - DYLD_LIBRARY_PATH - /Users/ypanforov/Developer/marathon/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator - OS_ACTIVITY_DT_MODE - YES - __XCODE_BUILT_PRODUCTS_DIR_PATHS - /Users/ypanforov/Developer/marathon/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator - __XPC_DYLD_FRAMEWORK_PATH - /Users/ypanforov/Developer/marathon/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator - __XPC_DYLD_LIBRARY_PATH - /Users/ypanforov/Developer/marathon/vendor-ios/src/test/resources/sample-xcworkspace/derived-data/Build/Products/Debug-iphonesimulator - - IsUITestBundle - - IsXCTRunnerHostedTestBundle - - ProductModuleName - sample_appUITests - SkipTestIdentifiers - - SkippedSuite - StoryboardTests/testDisabledButton - MoreTests/testDismissModal - - SystemAttachmentLifetime - deleteOnSuccess - TestBundlePath - __TESTHOST__/PlugIns/sample-appUITests.xctest - TestHostBundleIdentifier - com.apple.test.sample-appUITests-Runner - TestHostPath - __TESTROOT__/Debug-iphonesimulator/sample-appUITests-Runner.app - TestingEnvironmentVariables - - DYLD_FRAMEWORK_PATH - __TESTROOT__/Debug-iphonesimulator:__PLATFORMS__/iPhoneSimulator.platform/Developer/Library/Frameworks:__PLATFORMS__/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Developer/Library/PrivateFrameworks - DYLD_INSERT_LIBRARIES - __PLATFORMS__/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/usr/lib/libMainThreadChecker.dylib - DYLD_LIBRARY_PATH - __TESTROOT__/Debug-iphonesimulator:__PLATFORMS__/iPhoneSimulator.platform/Developer/Library/Frameworks:__PLATFORMS__/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Developer/Library/PrivateFrameworks - MTC_CRASH_ON_REPORT - 1 - XCODE_DBG_XPC_EXCLUSIONS - com.apple.dt.xctestSymbolicator - - ToolchainsSettingValue - - UITargetAppCommandLineArguments - - UITargetAppMainThreadCheckerEnabled - - UITargetAppPath - __TESTROOT__/Debug-iphonesimulator/sample-app.app - UserAttachmentLifetime - deleteOnSuccess - - - diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 6a9d64381..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/vendor/vendor-ios/src/test/resources/sample-xcworkspace/sample-app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - -