Skip to content

Commit 07e0b3f

Browse files
MalinskiyMalinskiy
committed
feat(apple): restructure apple to facilitate code reuse
1 parent 64c30e3 commit 07e0b3f

File tree

274 files changed

+448
-2814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

274 files changed

+448
-2814
lines changed

‎cli/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ distributions {
3434

3535
dependencies {
3636
implementation(project(":core"))
37-
implementation(project(":vendor:vendor-ios"))
37+
implementation(project(":vendor:vendor-apple:ios"))
3838
implementation(project(":vendor:vendor-android"))
3939
implementation(project(":analytics:usage"))
4040
implementation(Libraries.kotlinStdLib)

‎cli/src/main/kotlin/com/malinskiy/marathon/cli/ApplicationView.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import com.malinskiy.marathon.config.serialization.ConfigurationFactory
2020
import com.malinskiy.marathon.config.vendor.VendorConfiguration
2121
import com.malinskiy.marathon.di.marathonStartKoin
2222
import com.malinskiy.marathon.exceptions.ExceptionsReporterFactory
23-
import com.malinskiy.marathon.ios.AppleVendor
23+
import com.malinskiy.marathon.apple.ios.AppleVendor
2424
import com.malinskiy.marathon.log.MarathonLogging
2525
import org.koin.core.context.stopKoin
2626
import org.koin.dsl.module

‎settings.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ rootProject.name = "marathon"
1717
include("core")
1818
include("configuration")
1919
include("vendor:vendor-android")
20-
include("vendor:vendor-ios")
20+
include("vendor:vendor-apple:ios")
21+
include("vendor:vendor-apple:base")
2122
include("vendor:vendor-test")
2223
include("marathon-gradle-plugin")
2324
include("report:html-report")

‎vendor/vendor-apple/base/build.gradle.kts

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
plugins {
2+
`java-library`
3+
jacoco
4+
id("org.jetbrains.kotlin.jvm")
5+
id("org.jetbrains.dokka")
6+
}
7+
8+
dependencies {
9+
api(Libraries.sshj)
10+
}
11+
12+
setupDeployment()
13+
setupKotlinCompiler()
14+
setupTestTask()

‎vendor/vendor-ios/src/main/kotlin/net/schmizz/sshj/PatchedSSHClient.kt ‎vendor/vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/sshj/PatchedSSHClient.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
2-
package net.schmizz.sshj
2+
package com.malinskiy.marathon.apple.sshj
33

4-
import net.schmizz.sshj.connection.channel.direct.PatchedExecChannel
4+
import net.schmizz.sshj.Config
5+
import net.schmizz.sshj.SSHClient
6+
import sshj.connection.channel.direct.PatchedExecChannel
57
import net.schmizz.sshj.connection.channel.direct.Session
68

79
/**
810
* Subclass of SSHJ [SSHClient] that uses [PatchedSSHClient] which handles some strange features.
911
*/
10-
internal class PatchedSSHClient(config: Config) : SSHClient(config) {
12+
class PatchedSSHClient(config: Config) : SSHClient(config) {
1113
override fun startSession(): Session {
1214
check(isConnected) { "Not connected" }
1315
check(isAuthenticated) { "Not authenticated" }

‎vendor/vendor-ios/src/main/kotlin/net/schmizz/sshj/connection/channel/direct/PatchedExecChannel.kt ‎vendor/vendor-apple/base/src/main/kotlin/sshj/connection/channel/direct/PatchedExecChannel.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
2-
package net.schmizz.sshj.connection.channel.direct
2+
package sshj.connection.channel.direct
33

44
import net.schmizz.sshj.SSHClient
55
import net.schmizz.sshj.common.Buffer
66
import net.schmizz.sshj.common.DisconnectReason
77
import net.schmizz.sshj.common.SSHPacket
88
import net.schmizz.sshj.connection.ConnectionException
99
import net.schmizz.sshj.connection.channel.ChannelInputStream
10+
import net.schmizz.sshj.connection.channel.direct.SessionChannel
1011

1112
/**
1213
* Subclass of SSHJ [SessionChannel] that handles some strange features.

‎vendor/vendor-ios/build.gradle.kts ‎vendor/vendor-apple/ios/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ dependencies {
1818
implementation(Libraries.ddPlist)
1919
implementation(Libraries.guava)
2020
implementation(Libraries.rsync4j)
21-
implementation(Libraries.sshj)
21+
2222
implementation(Libraries.gson)
2323
implementation(Libraries.jacksonKotlin)
2424
implementation(Libraries.jacksonYaml)
2525
implementation(Libraries.jansi)
2626
implementation(Libraries.kotlinProcess)
2727
implementation(project(":core"))
28+
implementation(project(":vendor:vendor-apple:base"))
2829
testImplementation(TestLibraries.kluent)
2930
testImplementation(TestLibraries.assertk)
3031
testImplementation(TestLibraries.mockitoKotlin)

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleApplicationInstaller.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleApplicationInstaller.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

3+
import com.malinskiy.marathon.apple.ios.extensions.testBundle
4+
import com.malinskiy.marathon.apple.ios.model.Sdk
5+
import com.malinskiy.marathon.apple.ios.xctestrun.TestRootFactory
36
import com.malinskiy.marathon.config.Configuration
47
import com.malinskiy.marathon.config.exceptions.ConfigurationException
58
import com.malinskiy.marathon.config.vendor.VendorConfiguration
69
import com.malinskiy.marathon.config.vendor.ios.TestType
710
import com.malinskiy.marathon.exceptions.DeviceSetupException
811
import com.malinskiy.marathon.execution.withRetry
9-
import com.malinskiy.marathon.ios.extensions.testBundle
10-
import com.malinskiy.marathon.ios.model.Sdk
11-
import com.malinskiy.marathon.ios.xctestrun.TestRootFactory
1212
import com.malinskiy.marathon.log.MarathonLogging
1313

1414
class AppleApplicationInstaller(

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDevice.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDevice.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

3+
import com.malinskiy.marathon.apple.ios.cmd.CommandResult
4+
import com.malinskiy.marathon.apple.ios.test.TestEvent
5+
import com.malinskiy.marathon.apple.ios.test.TestRequest
36
import com.malinskiy.marathon.device.Device
47
import com.malinskiy.marathon.device.screenshot.Screenshottable
58
import com.malinskiy.marathon.exceptions.DeviceSetupException
6-
import com.malinskiy.marathon.ios.cmd.CommandResult
7-
import com.malinskiy.marathon.ios.test.TestEvent
8-
import com.malinskiy.marathon.ios.test.TestRequest
99
import com.malinskiy.marathon.report.logs.LogProducer
1010
import kotlinx.coroutines.channels.ReceiveChannel
1111
import java.io.File

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDeviceProvider.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDeviceProvider.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

33
import com.fasterxml.jackson.databind.JsonMappingException
44
import com.fasterxml.jackson.databind.ObjectMapper
55
import com.fasterxml.jackson.module.kotlin.readValue
66
import com.google.gson.Gson
77
import com.malinskiy.marathon.analytics.internal.pub.Track
8+
import com.malinskiy.marathon.apple.ios.configuration.AppleTarget
9+
import com.malinskiy.marathon.apple.ios.configuration.Marathondevices
10+
import com.malinskiy.marathon.apple.ios.configuration.Transport
11+
import com.malinskiy.marathon.apple.ios.configuration.Worker
12+
import com.malinskiy.marathon.apple.ios.device.AppleSimulatorProvider
13+
import com.malinskiy.marathon.apple.ios.device.SimulatorFactory
814
import com.malinskiy.marathon.config.Configuration
915
import com.malinskiy.marathon.config.vendor.VendorConfiguration
1016
import com.malinskiy.marathon.device.Device
1117
import com.malinskiy.marathon.device.DeviceProvider
1218
import com.malinskiy.marathon.exceptions.NoDevicesException
13-
import com.malinskiy.marathon.ios.configuration.AppleTarget
14-
import com.malinskiy.marathon.ios.configuration.Marathondevices
15-
import com.malinskiy.marathon.ios.configuration.Transport
16-
import com.malinskiy.marathon.ios.configuration.Worker
17-
import com.malinskiy.marathon.ios.device.AppleSimulatorProvider
18-
import com.malinskiy.marathon.ios.device.SimulatorFactory
1919
import com.malinskiy.marathon.log.MarathonLogging
2020
import com.malinskiy.marathon.time.Timer
2121
import kotlinx.coroutines.CoroutineScope

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleDeviceTestRunner.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleDeviceTestRunner.kt

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

3+
import com.malinskiy.marathon.apple.ios.extensions.testBundle
4+
import com.malinskiy.marathon.apple.ios.listener.AppleTestRunListener
5+
import com.malinskiy.marathon.apple.ios.test.TestEvent
6+
import com.malinskiy.marathon.apple.ios.test.TestFailed
7+
import com.malinskiy.marathon.apple.ios.test.TestIgnored
8+
import com.malinskiy.marathon.apple.ios.test.TestPassed
9+
import com.malinskiy.marathon.apple.ios.test.TestRequest
10+
import com.malinskiy.marathon.apple.ios.test.TestRunEnded
11+
import com.malinskiy.marathon.apple.ios.test.TestRunFailed
12+
import com.malinskiy.marathon.apple.ios.test.TestRunStartedEvent
13+
import com.malinskiy.marathon.apple.ios.test.TestStarted
314
import com.malinskiy.marathon.config.Configuration
415
import com.malinskiy.marathon.config.vendor.VendorConfiguration
5-
import com.malinskiy.marathon.ios.executor.listener.AppleTestRunListener
6-
import com.malinskiy.marathon.ios.extensions.testBundle
7-
import com.malinskiy.marathon.ios.test.TestEvent
8-
import com.malinskiy.marathon.ios.test.TestPassed
9-
import com.malinskiy.marathon.ios.test.TestFailed
10-
import com.malinskiy.marathon.ios.test.TestIgnored
11-
import com.malinskiy.marathon.ios.test.TestRequest
12-
import com.malinskiy.marathon.ios.test.TestRunEnded
13-
import com.malinskiy.marathon.ios.test.TestRunFailed
14-
import com.malinskiy.marathon.ios.test.TestRunStartedEvent
15-
import com.malinskiy.marathon.ios.test.TestStarted
1616
import com.malinskiy.marathon.log.MarathonLogging
1717
import com.malinskiy.marathon.test.TestBatch
1818
import com.malinskiy.marathon.test.toTestName

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleLogConfigurator.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleLogConfigurator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

33
import ch.qos.logback.classic.Level
44
import ch.qos.logback.classic.Logger

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleSimulatorDevice.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleSimulatorDevice.kt

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,31 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

33
import com.dd.plist.PropertyListParser
44
import com.malinskiy.marathon.analytics.internal.pub.Track
5+
import com.malinskiy.marathon.apple.ios.bin.AppleBinaryEnvironment
6+
import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.service.ApplicationService
7+
import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor
8+
import com.malinskiy.marathon.apple.ios.cmd.CommandResult
9+
import com.malinskiy.marathon.apple.ios.cmd.FileBridge
10+
import com.malinskiy.marathon.apple.ios.listener.AppleTestRunListener
11+
import com.malinskiy.marathon.apple.ios.listener.CompositeTestRunListener
12+
import com.malinskiy.marathon.apple.ios.listener.DebugTestRunListener
13+
import com.malinskiy.marathon.apple.ios.listener.ResultBundleRunListener
14+
import com.malinskiy.marathon.apple.ios.listener.TestResultsListener
15+
import com.malinskiy.marathon.apple.ios.listener.TestRunListenerAdapter
16+
import com.malinskiy.marathon.apple.ios.listener.screenshot.ScreenCapturerTestRunListener
17+
import com.malinskiy.marathon.apple.ios.listener.video.ScreenRecordingListener
18+
import com.malinskiy.marathon.apple.ios.logparser.XctestEventProducer
19+
import com.malinskiy.marathon.apple.ios.logparser.parser.DebugLogPrinter
20+
import com.malinskiy.marathon.apple.ios.logparser.parser.DeviceFailureException
21+
import com.malinskiy.marathon.apple.ios.logparser.parser.DiagnosticLogsPathFinder
22+
import com.malinskiy.marathon.apple.ios.logparser.parser.SessionResultsPathFinder
23+
import com.malinskiy.marathon.apple.ios.model.Arch
24+
import com.malinskiy.marathon.apple.ios.model.Sdk
25+
import com.malinskiy.marathon.apple.ios.model.Simulator
26+
import com.malinskiy.marathon.apple.ios.model.XcodeVersion
27+
import com.malinskiy.marathon.apple.ios.test.TestEvent
28+
import com.malinskiy.marathon.apple.ios.test.TestRequest
529
import com.malinskiy.marathon.config.Configuration
630
import com.malinskiy.marathon.config.ScreenRecordingPolicy
731
import com.malinskiy.marathon.config.vendor.VendorConfiguration
@@ -21,30 +45,6 @@ import com.malinskiy.marathon.execution.TestBatchResults
2145
import com.malinskiy.marathon.execution.listener.LineListener
2246
import com.malinskiy.marathon.execution.listener.LogListener
2347
import com.malinskiy.marathon.io.FileManager
24-
import com.malinskiy.marathon.ios.bin.AppleBinaryEnvironment
25-
import com.malinskiy.marathon.ios.bin.xcrun.simctl.service.ApplicationService
26-
import com.malinskiy.marathon.ios.cmd.CommandExecutor
27-
import com.malinskiy.marathon.ios.cmd.CommandResult
28-
import com.malinskiy.marathon.ios.cmd.FileBridge
29-
import com.malinskiy.marathon.ios.executor.listener.AppleTestRunListener
30-
import com.malinskiy.marathon.ios.executor.listener.CompositeTestRunListener
31-
import com.malinskiy.marathon.ios.executor.listener.DebugTestRunListener
32-
import com.malinskiy.marathon.ios.executor.listener.ResultBundleRunListener
33-
import com.malinskiy.marathon.ios.executor.listener.video.ScreenRecordingListener
34-
import com.malinskiy.marathon.ios.executor.listener.TestResultsListener
35-
import com.malinskiy.marathon.ios.executor.listener.TestRunListenerAdapter
36-
import com.malinskiy.marathon.ios.executor.listener.screenshot.ScreenCapturerTestRunListener
37-
import com.malinskiy.marathon.ios.logparser.XctestEventProducer
38-
import com.malinskiy.marathon.ios.logparser.parser.DebugLogPrinter
39-
import com.malinskiy.marathon.ios.logparser.parser.DeviceFailureException
40-
import com.malinskiy.marathon.ios.logparser.parser.DiagnosticLogsPathFinder
41-
import com.malinskiy.marathon.ios.logparser.parser.SessionResultsPathFinder
42-
import com.malinskiy.marathon.ios.model.Arch
43-
import com.malinskiy.marathon.ios.model.Sdk
44-
import com.malinskiy.marathon.ios.model.Simulator
45-
import com.malinskiy.marathon.ios.model.XcodeVersion
46-
import com.malinskiy.marathon.ios.test.TestEvent
47-
import com.malinskiy.marathon.ios.test.TestRequest
4848
import com.malinskiy.marathon.log.MarathonLogging
4949
import com.malinskiy.marathon.report.attachment.AttachmentProvider
5050
import com.malinskiy.marathon.report.logs.LogWriter

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleTestBundleIdentifier.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleTestBundleIdentifier.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

3+
import com.malinskiy.marathon.apple.ios.model.AppleTestBundle
34
import com.malinskiy.marathon.config.exceptions.ConfigurationException
45
import com.malinskiy.marathon.execution.bundle.TestBundleIdentifier
5-
import com.malinskiy.marathon.ios.model.AppleTestBundle
66
import com.malinskiy.marathon.test.Test
77
import com.malinskiy.marathon.test.toTestName
8-
import java.io.File
98
import java.util.concurrent.ConcurrentHashMap
109

1110
class AppleTestBundleIdentifier : TestBundleIdentifier {

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/AppleVendor.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleVendor.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

33
import com.fasterxml.jackson.databind.ObjectMapper
44
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
55
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
66
import com.fasterxml.jackson.module.kotlin.KotlinFeature
77
import com.fasterxml.jackson.module.kotlin.KotlinModule
88
import com.google.gson.GsonBuilder
9+
import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlDeviceList
10+
import com.malinskiy.marathon.apple.ios.bin.xcrun.simctl.model.SimctlDeviceListDeserializer
911
import com.malinskiy.marathon.config.Configuration
1012
import com.malinskiy.marathon.config.vendor.VendorConfiguration
1113
import com.malinskiy.marathon.config.vendor.ios.TestParserConfiguration
1214
import com.malinskiy.marathon.device.DeviceProvider
1315
import com.malinskiy.marathon.execution.TestParser
1416
import com.malinskiy.marathon.execution.bundle.TestBundleIdentifier
15-
import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlDeviceList
16-
import com.malinskiy.marathon.ios.bin.xcrun.simctl.model.SimctlDeviceListDeserializer
1717
import com.malinskiy.marathon.log.MarathonLogConfigurator
1818
import org.koin.dsl.module
1919

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/NmTestParser.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/NmTestParser.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

3+
import com.malinskiy.marathon.apple.ios.extensions.testBundle
4+
import com.malinskiy.marathon.apple.ios.model.AppleTestBundle
35
import com.malinskiy.marathon.config.Configuration
46
import com.malinskiy.marathon.config.exceptions.ConfigurationException
57
import com.malinskiy.marathon.config.vendor.VendorConfiguration
@@ -8,8 +10,6 @@ import com.malinskiy.marathon.device.Device
810
import com.malinskiy.marathon.exceptions.TestParsingException
911
import com.malinskiy.marathon.execution.RemoteTestParser
1012
import com.malinskiy.marathon.execution.withRetry
11-
import com.malinskiy.marathon.ios.extensions.testBundle
12-
import com.malinskiy.marathon.ios.model.AppleTestBundle
1313
import com.malinskiy.marathon.log.MarathonLogging
1414
import com.malinskiy.marathon.test.Test
1515
import kotlinx.coroutines.CancellationException

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/RecorderTypeSelector.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/RecorderTypeSelector.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

33
import com.malinskiy.marathon.config.vendor.ios.RecorderType
44
import com.malinskiy.marathon.config.vendor.ios.ScreenRecordConfiguration

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/RemoteFileManager.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/RemoteFileManager.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

3+
import com.malinskiy.marathon.apple.ios.RemoteFileManager.Companion.FILE_SEPARATOR
34
import com.malinskiy.marathon.config.vendor.ios.Type
45
import com.malinskiy.marathon.extension.escape
5-
import com.malinskiy.marathon.ios.RemoteFileManager.Companion.FILE_SEPARATOR
66
import com.malinskiy.marathon.log.MarathonLogging
77
import com.malinskiy.marathon.test.Test
88
import com.malinskiy.marathon.test.TestBatch

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/XCTestParser.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/XCTestParser.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
package com.malinskiy.marathon.ios
1+
package com.malinskiy.marathon.apple.ios
22

3+
import com.malinskiy.marathon.apple.ios.extensions.testBundle
4+
import com.malinskiy.marathon.apple.ios.model.AppleTestBundle
5+
import com.malinskiy.marathon.apple.ios.test.TestEvent
6+
import com.malinskiy.marathon.apple.ios.test.TestRequest
7+
import com.malinskiy.marathon.apple.ios.test.TestStarted
38
import com.malinskiy.marathon.config.Configuration
49
import com.malinskiy.marathon.config.exceptions.ConfigurationException
510
import com.malinskiy.marathon.config.vendor.VendorConfiguration
@@ -8,11 +13,6 @@ import com.malinskiy.marathon.exceptions.TestParsingException
813
import com.malinskiy.marathon.execution.RemoteTestParser
914
import com.malinskiy.marathon.execution.listener.LineListener
1015
import com.malinskiy.marathon.execution.withRetry
11-
import com.malinskiy.marathon.ios.extensions.testBundle
12-
import com.malinskiy.marathon.ios.model.AppleTestBundle
13-
import com.malinskiy.marathon.ios.test.TestEvent
14-
import com.malinskiy.marathon.ios.test.TestRequest
15-
import com.malinskiy.marathon.ios.test.TestStarted
1616
import com.malinskiy.marathon.log.MarathonLogging
1717
import com.malinskiy.marathon.test.Test
1818
import kotlinx.coroutines.CancellationException

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/AppleBinaryEnvironment.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/AppleBinaryEnvironment.kt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package com.malinskiy.marathon.ios.bin
1+
package com.malinskiy.marathon.apple.ios.bin
22

33
import com.google.gson.Gson
4+
import com.malinskiy.marathon.apple.ios.bin.codesign.Codesign
5+
import com.malinskiy.marathon.apple.ios.bin.getconf.Getconf
6+
import com.malinskiy.marathon.apple.ios.bin.lipo.Lipo
7+
import com.malinskiy.marathon.apple.ios.bin.nm.Nm
8+
import com.malinskiy.marathon.apple.ios.bin.plistbuddy.PlistBuddy
9+
import com.malinskiy.marathon.apple.ios.bin.xcodeselect.Xcodeselect
10+
import com.malinskiy.marathon.apple.ios.bin.xcrun.Xcrun
11+
import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor
412
import com.malinskiy.marathon.config.Configuration
513
import com.malinskiy.marathon.config.vendor.VendorConfiguration
6-
import com.malinskiy.marathon.ios.bin.codesign.Codesign
7-
import com.malinskiy.marathon.ios.bin.getconf.Getconf
8-
import com.malinskiy.marathon.ios.bin.lipo.Lipo
9-
import com.malinskiy.marathon.ios.bin.nm.Nm
10-
import com.malinskiy.marathon.ios.bin.plistbuddy.PlistBuddy
11-
import com.malinskiy.marathon.ios.bin.xcodeselect.Xcodeselect
12-
import com.malinskiy.marathon.ios.bin.xcrun.Xcrun
13-
import com.malinskiy.marathon.ios.cmd.CommandExecutor
1414

1515
class AppleBinaryEnvironment(
1616
commandExecutor: CommandExecutor,

‎vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/bin/codesign/Codesign.kt ‎vendor/vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/bin/codesign/Codesign.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.malinskiy.marathon.ios.bin.codesign
1+
package com.malinskiy.marathon.apple.ios.bin.codesign
22

3+
import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor
4+
import com.malinskiy.marathon.apple.ios.cmd.CommandResult
35
import com.malinskiy.marathon.config.vendor.ios.TimeoutConfiguration
46
import com.malinskiy.marathon.exceptions.DeviceSetupException
5-
import com.malinskiy.marathon.ios.cmd.CommandExecutor
6-
import com.malinskiy.marathon.ios.cmd.CommandResult
77
import java.time.Duration
88

99
/**

0 commit comments

Comments
 (0)