From fe2ee9886d86681b89cb8a635cc7b28eb34e3524 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Thu, 20 Oct 2022 10:26:49 +0200 Subject: [PATCH] [Gradle] watchosDeviceArm64 should not run simulator tests This reverts commit 640ba1ec ^KT-54583 Verification Pending --- .../kotlin/generators/gradle/dsl/presetEntries.kt | 1 - .../kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt index 35fe5296177..7e71ff65f19 100644 --- a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt +++ b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt @@ -58,7 +58,6 @@ private val nativeTargetsWithSimulatorTests = KonanTarget.WATCHOS_X86, KonanTarget.WATCHOS_X64, KonanTarget.WATCHOS_SIMULATOR_ARM64, - KonanTarget.WATCHOS_DEVICE_ARM64, KonanTarget.TVOS_X64, KonanTarget.TVOS_SIMULATOR_ARM64 diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt index 37cb70152ad..fcd313f9d79 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt @@ -154,11 +154,8 @@ class KotlinMultiplatformPlugin : Plugin { // Note: modifying these sets should also be reflected in the DSL code generator, see 'presetEntries.kt' val nativeTargetsWithHostTests = setOf(LINUX_X64, MACOS_X64, MACOS_ARM64, MINGW_X64) - val nativeTargetsWithSimulatorTests = setOf( - IOS_X64, IOS_SIMULATOR_ARM64, - WATCHOS_X86, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64, WATCHOS_DEVICE_ARM64, - TVOS_X64, TVOS_SIMULATOR_ARM64 - ) + val nativeTargetsWithSimulatorTests = + setOf(IOS_X64, IOS_SIMULATOR_ARM64, WATCHOS_X86, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64, TVOS_X64, TVOS_SIMULATOR_ARM64) HostManager().targets .forEach { (_, konanTarget) ->