From 640ba1ecfae25b07c5ee5ab8666521780d1c7aaa Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Tue, 4 Oct 2022 18:01:47 +0200 Subject: [PATCH] [Gradle] Add watchosDeviceArm64 to nativeTargetsWithSimulatorTests ^KT-53107 --- .../kotlin/generators/gradle/dsl/presetEntries.kt | 1 + .../kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt | 7 +++++-- 2 files changed, 6 insertions(+), 2 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 7e71ff65f19..35fe5296177 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,6 +58,7 @@ 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 c518ab08e56..2216087c43c 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 @@ -163,8 +163,11 @@ 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, TVOS_X64, TVOS_SIMULATOR_ARM64) + val nativeTargetsWithSimulatorTests = setOf( + IOS_X64, IOS_SIMULATOR_ARM64, + WATCHOS_X86, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64, WATCHOS_DEVICE_ARM64, + TVOS_X64, TVOS_SIMULATOR_ARM64 + ) HostManager().targets .forEach { (_, konanTarget) ->