Support Kotlin 2.2.20 by no longer matching against removed targets

Author: zacharee

resources-build-logic/src/main/kotlin/apple-bundle-searcher-convention.gradle.kts

@@ -105,7 +105,6 @@ kotlin.targets
 
 fun KonanTarget.getAppleSdk(): String {
     return when (this) {
-        KonanTarget.IOS_ARM32,
         KonanTarget.IOS_ARM64 -> "iphoneos"
 
         KonanTarget.IOS_SIMULATOR_ARM64,
@@ -124,16 +123,14 @@ fun KonanTarget.getAppleSdk(): String {
 
         KonanTarget.WATCHOS_ARM64,
         KonanTarget.WATCHOS_SIMULATOR_ARM64,
-        KonanTarget.WATCHOS_X64,
-        KonanTarget.WATCHOS_X86 -> "watchsimulator"
+        KonanTarget.WATCHOS_X64 -> "watchsimulator"
 
         else -> error("Unsupported target for selecting SDK: $this")
     }
 }
 
 fun KonanTarget.getClangTarget(): String {
     return when (this) {
-        KonanTarget.IOS_ARM32 -> "armv7-apple-ios"
         KonanTarget.IOS_ARM64 -> "aarch64-apple-ios"
         KonanTarget.IOS_SIMULATOR_ARM64 -> "aarch64-apple-ios-simulator"
         KonanTarget.IOS_X64 -> "x86_64-apple-ios-simulator"
@@ -150,7 +147,6 @@ fun KonanTarget.getClangTarget(): String {
         KonanTarget.WATCHOS_DEVICE_ARM64 -> "aarch64-apple-watchos"
         KonanTarget.WATCHOS_SIMULATOR_ARM64 -> "aarch64-apple-watchos-simulator"
         KonanTarget.WATCHOS_X64 -> "x86_64-apple-watchos-simulator"
-        KonanTarget.WATCHOS_X86 -> "i386-apple-watchos"
 
         else -> error("Unsupported target for selecting clang target: $this")
     }

resources-generator/src/main/kotlin/dev/icerock/gradle/utils/AppleSdk.kt

@@ -23,7 +23,6 @@ internal object AppleSdk {
                 targets.addAll(archs.map { arch ->
                     when (arch) {
                         "arm64", "arm64e" -> KonanTarget.IOS_ARM64
-                        "armv7", "armv7s" -> KonanTarget.IOS_ARM32
                         else -> throw UnknownArchitectureException(platform, arch)
                     }
                 })
@@ -51,7 +50,6 @@ internal object AppleSdk {
                 targets.addAll(archs.map { arch ->
                     when (arch) {
                         "arm64", "arm64e" -> KonanTarget.WATCHOS_SIMULATOR_ARM64
-                        "i386" -> KonanTarget.WATCHOS_X86
                         "x86_64" -> KonanTarget.WATCHOS_X64
                         else -> throw UnknownArchitectureException(platform, arch)
                     }

resources-generator/src/main/kotlin/dev/icerock/gradle/utils/createByPlatform.kt

@@ -25,44 +25,7 @@ internal fun <T> createByPlatform(
         KotlinPlatformType.jvm -> createJvm()
         KotlinPlatformType.androidJvm -> createAndroid()
         KotlinPlatformType.js -> createJs()
-        KotlinPlatformType.native -> when (konanTarget()) {
-            KonanTarget.IOS_ARM32,
-            KonanTarget.IOS_ARM64,
-            KonanTarget.IOS_SIMULATOR_ARM64,
-            KonanTarget.IOS_X64,
-
-            KonanTarget.MACOS_ARM64,
-            KonanTarget.MACOS_X64,
-
-            KonanTarget.TVOS_ARM64,
-            KonanTarget.TVOS_SIMULATOR_ARM64,
-            KonanTarget.TVOS_X64,
-
-            KonanTarget.WATCHOS_ARM32,
-            KonanTarget.WATCHOS_ARM64,
-            KonanTarget.WATCHOS_DEVICE_ARM64,
-            KonanTarget.WATCHOS_SIMULATOR_ARM64,
-            KonanTarget.WATCHOS_X64,
-            KonanTarget.WATCHOS_X86 -> createApple()
-
-            KonanTarget.ANDROID_ARM32,
-            KonanTarget.ANDROID_ARM64,
-            KonanTarget.ANDROID_X64,
-            KonanTarget.ANDROID_X86,
-
-            KonanTarget.LINUX_ARM32_HFP,
-            KonanTarget.LINUX_ARM64,
-            KonanTarget.LINUX_MIPS32,
-            KonanTarget.LINUX_MIPSEL32,
-            KonanTarget.LINUX_X64,
-
-            KonanTarget.MINGW_X64,
-            KonanTarget.MINGW_X86,
-
-            KonanTarget.WASM32,
-
-            is KonanTarget.ZEPHYR -> error("$konanTarget not supported by moko-resources now")
-        }
+        KotlinPlatformType.native -> error("${konanTarget()} not supported by moko-resources now")
 
         KotlinPlatformType.wasm -> createWasm()
     }