From c83286ef7e20b5e8347fdea05f33040dc944ff80 Mon Sep 17 00:00:00 2001 From: "konstantin.tskhovrebov" Date: Thu, 29 Sep 2022 21:33:24 +0200 Subject: [PATCH] Set Xcode test device ID only if Xcode is available. --- .../targets/native/KotlinNativeTargetConfigurator.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt index df0463748b8..140dcaa5707 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt @@ -669,16 +669,13 @@ class KotlinNativeTargetWithSimulatorTestsConfigurator : override fun configureTestTask(target: KotlinNativeTargetWithSimulatorTests, testTask: KotlinNativeSimulatorTest) { super.configureTestTask(target, testTask) - - val deviceIdProvider = testTask.project.provider { - if (Xcode != null) { + if (Xcode != null) { + val deviceIdProvider = testTask.project.provider { Xcode.getDefaultTestDeviceId(target.konanTarget) ?: error("Xcode does not support simulator tests for ${target.konanTarget.name}. Check that requested SDK is installed.") - } else { - error("Xcode is not found.") } + testTask.device.set(deviceIdProvider) } - testTask.device.set(deviceIdProvider) } override fun createTestRun(