From 599d5579de3eb39c95c2b99be3fb81331610eace Mon Sep 17 00:00:00 2001 From: Luca Spinazzola Date: Sun, 15 Oct 2023 22:32:46 -0400 Subject: [PATCH] implement TargetName.WatchOSDeviceArm64 --- .../multiplatformswiftpackage/domain/TargetName.kt | 1 + .../multiplatformswiftpackage/domain/extensions.kt | 1 + .../multiplatformswiftpackage/task/CreateXCFrameworkTask.kt | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/domain/TargetName.kt b/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/domain/TargetName.kt index f5a6a1e..f103e52 100644 --- a/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/domain/TargetName.kt +++ b/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/domain/TargetName.kt @@ -8,6 +8,7 @@ internal enum class TargetName(val identifier: String) { WatchOSarm64("watchosArm64"), WatchOSx86("watchosX86"), WatchOSx64("watchosX64"), + WatchOSDeviceArm64("watchosDeviceArm64"), WatchOSSimulatorArm64("watchosSimulatorArm64"), TvOSarm64("tvosArm64"), TvOSx64("tvosX64"), diff --git a/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/domain/extensions.kt b/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/domain/extensions.kt index 8764362..5d8011d 100644 --- a/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/domain/extensions.kt +++ b/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/domain/extensions.kt @@ -25,6 +25,7 @@ internal val TargetName.konanTarget: KonanTarget get() = when (this) { TargetName.WatchOSarm64 -> KonanTarget.WATCHOS_ARM64 TargetName.WatchOSx86 -> KonanTarget.WATCHOS_X86 TargetName.WatchOSx64 -> KonanTarget.WATCHOS_X64 + TargetName.WatchOSDeviceArm64 -> KonanTarget.WATCHOS_DEVICE_ARM64 TargetName.WatchOSSimulatorArm64 -> KonanTarget.WATCHOS_SIMULATOR_ARM64 TargetName.TvOSarm64 -> KonanTarget.TVOS_ARM64 TargetName.TvOSx64 -> KonanTarget.TVOS_X64 diff --git a/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/task/CreateXCFrameworkTask.kt b/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/task/CreateXCFrameworkTask.kt index 56ca016..c870965 100644 --- a/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/task/CreateXCFrameworkTask.kt +++ b/src/main/kotlin/com/chromaticnoise/multiplatformswiftpackage/task/CreateXCFrameworkTask.kt @@ -27,6 +27,7 @@ internal fun getWatchosSimulatorFrameworks(configuration: PluginConfiguration): .filter { it.linkTask.name.contains("WatchosX86") || it.linkTask.name.contains("WatchosX64") + || it.linkTask.name.contains("WatchosDeviceArm64") || it.linkTask.name.contains("WatchosSimulatorArm64") } }