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

[K/N] Choose watchOS simulator depending on Xcode version

Browse Source 
Merge-request: KT-MR-7410
Merged-by: Pavel Punegov <Pavel.Punegov@jetbrains.com>
This commit is contained in:
Pavel Punegov
2022-10-17 12:52:52 +00:00
committed by Space Team
parent 18ce3fc020
commit bc33f84678
1 changed files with 2 additions and 1 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
+2 -1
View File
@@ -270,10 +270,11 @@ private fun simulator(project: Project): ExecutorService = object : ExecutorServ
} }
private val device by lazy { private val device by lazy {
val version = Xcode.findCurrent().version
val default = project.findProperty("iosDevice")?.toString() ?: when (target.family) { val default = project.findProperty("iosDevice")?.toString() ?: when (target.family) {
Family.TVOS -> "Apple TV 4K" Family.TVOS -> "Apple TV 4K"
Family.IOS -> "iPhone 11" Family.IOS -> "iPhone 11"
Family.WATCHOS -> "Apple Watch Series 6 (40mm)" Family.WATCHOS -> "Apple Watch Series 6 " + (if (version.startsWith("14")) "(40mm)" else "- 40mm")
else -> error("Unexpected simulation target: $target") else -> error("Unexpected simulation target: $target")
} }