diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt index a52a54e4a17..712ef1d1da8 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt @@ -318,7 +318,12 @@ private fun sshExecutor(project: Project): ExecutorService = object : ExecutorSe } } -internal data class DeviceTarget(@Expose val name: String, @Expose val udid: String, @Expose val state: String, @Expose val type: String) +internal data class DeviceTarget( + @Expose val name: String, + @Expose val udid: String, + @Expose val state: String, + @Expose val type: String +) private fun deviceLauncher(project: Project) = object : ExecutorService { private val xcProject = Paths.get(project.testOutputRoot, "launcher") diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt index 75a2686493a..7a7ee89f3ba 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt @@ -237,6 +237,7 @@ fun compileSwift(project: Project, target: KonanTarget, sources: List, o val swiftTarget = when (target) { KonanTarget.IOS_X64 -> "x86_64-apple-ios" + configs.osVersionMin + KonanTarget.IOS_ARM32 -> "armv7-apple-ios" + configs.osVersionMin KonanTarget.IOS_ARM64 -> "arm64-apple-ios" + configs.osVersionMin KonanTarget.TVOS_X64 -> "x86_64-apple-tvos" + configs.osVersionMin KonanTarget.TVOS_ARM64 -> "arm64-apple-tvos" + configs.osVersionMin