From 1b3cc0dfaab17332f50a4e198706185903cf64b2 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Tue, 4 Oct 2022 21:18:26 +0200 Subject: [PATCH] [Gradle] Register watchosDeviceArm64 in commonizer ^KT-53107 --- .../kotlin/commonizer/CommonizeNativeDistributionTest.kt | 2 +- .../kotlin/commonizer/mergedtree/PlatformWidthIndex.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizeNativeDistributionTest.kt b/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizeNativeDistributionTest.kt index 6d89d7969eb..fe2d5436926 100644 --- a/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizeNativeDistributionTest.kt +++ b/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizeNativeDistributionTest.kt @@ -71,7 +71,7 @@ class CommonizeNativeDistributionTest { fun `commonize - apple platforms`() { assumeTrue("Test is only supported on macos", HostManager.hostIsMac) val iosTarget = CommonizerTarget(IOS_ARM64, IOS_X64, IOS_SIMULATOR_ARM64) - val watchosTarget = CommonizerTarget(WATCHOS_ARM64, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64) + val watchosTarget = CommonizerTarget(WATCHOS_ARM64, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64, WATCHOS_DEVICE_ARM64) val macosTarget = CommonizerTarget(MACOS_X64, MACOS_ARM64) val appleTarget = SharedCommonizerTarget(iosTarget.konanTargets + watchosTarget.konanTargets + macosTarget.konanTargets) diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/PlatformWidthIndex.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/PlatformWidthIndex.kt index 05f5b15ecad..426653ed1c7 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/PlatformWidthIndex.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/PlatformWidthIndex.kt @@ -28,6 +28,7 @@ object PlatformWidthIndex { LeafCommonizerTarget(KonanTarget.WATCHOS_X86) to PlatformIntWidth.INT, LeafCommonizerTarget(KonanTarget.WATCHOS_X64) to PlatformIntWidth.LONG, LeafCommonizerTarget(KonanTarget.WATCHOS_SIMULATOR_ARM64) to PlatformIntWidth.LONG, + LeafCommonizerTarget(KonanTarget.WATCHOS_DEVICE_ARM64) to PlatformIntWidth.LONG, LeafCommonizerTarget(KonanTarget.TVOS_ARM64) to PlatformIntWidth.LONG, LeafCommonizerTarget(KonanTarget.TVOS_X64) to PlatformIntWidth.LONG, LeafCommonizerTarget(KonanTarget.TVOS_SIMULATOR_ARM64) to PlatformIntWidth.LONG,