From 0127c3a6c401831492decb6c133998ec490789b0 Mon Sep 17 00:00:00 2001 From: "konstantin.tskhovrebov" Date: Fri, 7 Oct 2022 12:29:09 +0200 Subject: [PATCH] [KT-54442] Fix default test device Apple OS family parser. --- .../org/jetbrains/kotlin/gradle/utils/Xcode.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/Xcode.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/Xcode.kt index 86af3487c61..28a33a5d546 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/Xcode.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/Xcode.kt @@ -38,12 +38,17 @@ class XcodeUtils private constructor() { val out = runCommand(listOf("/usr/bin/xcrun", "simctl", "list", "devices", "available")) - val result = mutableMapOf() - var os: String? = null + val result = mutableMapOf() + var os: Family? = null out.lines().forEach { s -> val osFound = osRegex.find(s)?.value if (osFound != null) { - os = osFound.split(" ")[1] + val osName = osFound.split(" ")[1] + os = try { + Family.valueOf(osName.toUpperCaseAsciiOnly()) + } catch (e: Exception) { + null + } } else { val currentOs = os if (currentOs != null) { @@ -55,10 +60,7 @@ class XcodeUtils private constructor() { } } } - - result.entries.associate { (osName, deviceId) -> - Family.valueOf(osName.toUpperCaseAsciiOnly()) to deviceId - } + result } fun getDefaultTestDeviceId(target: KonanTarget): String? = defaultTestDevices[target.family]