From 991e5210ba5ceb847bb01074df05dd8a75f488b8 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Thu, 25 Mar 2021 14:07:53 +0300 Subject: [PATCH] Simplify further support for simulators by using target family --- .../kotlin/org/jetbrains/kotlin/ExecutorService.kt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt index 04814e09f90..44736231198 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt @@ -23,11 +23,8 @@ import org.gradle.api.Project import org.gradle.process.ExecResult import org.gradle.process.ExecSpec import org.gradle.util.ConfigureUtil -import org.jetbrains.kotlin.konan.target.Architecture -import org.jetbrains.kotlin.konan.target.ConfigurablesWithEmulator +import org.jetbrains.kotlin.konan.target.* -import org.jetbrains.kotlin.konan.target.KonanTarget -import org.jetbrains.kotlin.konan.target.Xcode import java.io.* import java.nio.file.Path @@ -256,11 +253,10 @@ private fun simulator(project: Project): ExecutorService = object : ExecutorServ } private val device by lazy { - val default = project.findProperty("iosDevice")?.toString() ?: when (target) { - KonanTarget.TVOS_X64 -> "Apple TV 4K" - KonanTarget.IOS_X64 -> "iPhone 12" - KonanTarget.WATCHOS_X64 -> "Apple Watch Series 6 - 40mm" - KonanTarget.WATCHOS_X86 -> "Apple Watch Series 5 - 40mm" + val default = project.findProperty("iosDevice")?.toString() ?: when (target.family) { + Family.TVOS -> "Apple TV 4K" + Family.IOS -> "iPhone 12" + Family.WATCHOS -> "Apple Watch Series 6 - 40mm" else -> error("Unexpected simulation target: $target") }