azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify further support for simulators by using target family

Browse Source
This commit is contained in:
Pavel Punegov
2021-03-25 14:07:53 +03:00
committed by Space
parent 5acd72d5a5
commit 991e5210ba
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
+5 -9
View File
@@ -23,11 +23,8 @@ import org.gradle.api.Project
import org.gradle.process.ExecResult import org.gradle.process.ExecResult
import org.gradle.process.ExecSpec import org.gradle.process.ExecSpec
import org.gradle.util.ConfigureUtil import org.gradle.util.ConfigureUtil
import org.jetbrains.kotlin.konan.target.Architecture import org.jetbrains.kotlin.konan.target.*
import org.jetbrains.kotlin.konan.target.ConfigurablesWithEmulator
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.target.Xcode
import java.io.* import java.io.*
import java.nio.file.Path import java.nio.file.Path
@@ -256,11 +253,10 @@ private fun simulator(project: Project): ExecutorService = object : ExecutorServ
} }
private val device by lazy { private val device by lazy {
val default = project.findProperty("iosDevice")?.toString() ?: when (target) { val default = project.findProperty("iosDevice")?.toString() ?: when (target.family) {
KonanTarget.TVOS_X64 -> "Apple TV 4K" Family.TVOS -> "Apple TV 4K"
KonanTarget.IOS_X64 -> "iPhone 12" Family.IOS -> "iPhone 12"
KonanTarget.WATCHOS_X64 -> "Apple Watch Series 6 - 40mm" Family.WATCHOS -> "Apple Watch Series 6 - 40mm"
KonanTarget.WATCHOS_X86 -> "Apple Watch Series 5 - 40mm"
else -> error("Unexpected simulation target: $target") else -> error("Unexpected simulation target: $target")
} }