From 1b7f673e94640367386dab1d3562d5276e66e306 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Tue, 4 Oct 2022 21:17:43 +0200 Subject: [PATCH] [Gradle] Register watchosDeviceArm64 in apple-specific tasks ^KT-53107 --- .../kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt | 2 +- .../gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt | 2 +- .../kotlin/gradle/targets/native/tasks/FatFrameworkTask.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt index 39edd9d1cd7..93b99fc501b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt @@ -26,7 +26,7 @@ internal enum class AppleTarget( MACOS_DEVICE("macos", listOf(KonanTarget.MACOS_X64, KonanTarget.MACOS_ARM64)), IPHONE_DEVICE("ios", listOf(KonanTarget.IOS_ARM32, KonanTarget.IOS_ARM64)), IPHONE_SIMULATOR("iosSimulator", listOf(KonanTarget.IOS_X64, KonanTarget.IOS_SIMULATOR_ARM64)), - WATCHOS_DEVICE("watchos", listOf(KonanTarget.WATCHOS_ARM32, KonanTarget.WATCHOS_ARM64)), + WATCHOS_DEVICE("watchos", listOf(KonanTarget.WATCHOS_ARM32, KonanTarget.WATCHOS_ARM64, KonanTarget.WATCHOS_DEVICE_ARM64)), WATCHOS_SIMULATOR("watchosSimulator", listOf(KonanTarget.WATCHOS_X86, KonanTarget.WATCHOS_X64, KonanTarget.WATCHOS_SIMULATOR_ARM64)), TVOS_DEVICE("tvos", listOf(KonanTarget.TVOS_ARM64)), TVOS_SIMULATOR("tvosSimulator", listOf(KonanTarget.TVOS_X64, KonanTarget.TVOS_SIMULATOR_ARM64)) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt index c8ded46cb4f..fb0638e6cec 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/KotlinCocoapodsPlugin.kt @@ -87,7 +87,7 @@ private val KotlinNativeTarget.toValidSDK: String get() = when (konanTarget) { IOS_X64, IOS_SIMULATOR_ARM64 -> "iphonesimulator" IOS_ARM32, IOS_ARM64 -> "iphoneos" - WATCHOS_X86, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64 -> "watchsimulator" + WATCHOS_X86, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64, WATCHOS_DEVICE_ARM64 -> "watchsimulator" WATCHOS_ARM32, WATCHOS_ARM64 -> "watchos" TVOS_X64, TVOS_SIMULATOR_ARM64 -> "appletvsimulator" TVOS_ARM64 -> "appletvos" diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/FatFrameworkTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/FatFrameworkTask.kt index 74b8331a4dd..4c2c0466f27 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/FatFrameworkTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/FatFrameworkTask.kt @@ -235,7 +235,7 @@ open class FatFrameworkTask : DefaultTask() { MACOS_X64, MACOS_ARM64 -> "MacOSX" IOS_ARM32, IOS_ARM64, IOS_X64, IOS_SIMULATOR_ARM64 -> "iPhoneOS" TVOS_ARM64, TVOS_X64, TVOS_SIMULATOR_ARM64 -> "AppleTVOS" - WATCHOS_ARM32, WATCHOS_ARM64, WATCHOS_X86, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64 -> "WatchOS" + WATCHOS_ARM32, WATCHOS_ARM64, WATCHOS_X86, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64, WATCHOS_DEVICE_ARM64 -> "WatchOS" else -> error("Fat frameworks are not supported for platform `${target.visibleName}`") } @@ -420,7 +420,7 @@ open class FatFrameworkTask : DefaultTask() { companion object { private val supportedTargets = listOf( IOS_ARM32, IOS_ARM64, IOS_X64, - WATCHOS_ARM32, WATCHOS_ARM64, WATCHOS_X86, WATCHOS_X64, + WATCHOS_ARM32, WATCHOS_ARM64, WATCHOS_X86, WATCHOS_X64, WATCHOS_DEVICE_ARM64, TVOS_ARM64, TVOS_X64, MACOS_X64, MACOS_ARM64 )