azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[native] Drop deprecated Kotlin/Native targets (2/8)

Browse Source 
Remove plain references to removed KonanTarget or Family entries. All
the changes in this commit are simple removal of some when-branches
on now dropped entries

^KT-64517
This commit is contained in:
Dmitry Savvinov
2024-01-16 15:36:07 +01:00
committed by Space Team
parent 0f05ffe111
commit 85bcc8443d
12 changed files with 20 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/FatFrameworkTask.kt
+4 -8
View File
@@ -208,9 +208,6 @@ internal constructor(
Architecture.X86 -> AppleArchitecture.X86
Architecture.ARM64 -> if (this == WATCHOS_ARM64) AppleArchitecture.ARM64_32 else AppleArchitecture.ARM64
Architecture.ARM32 -> AppleArchitecture.ARM32
Architecture.MIPS32,
Architecture.MIPSEL32,
Architecture.WASM32 -> error("Fat frameworks are not supported for target `$name`")
}
// region DSL methods.
@@ -275,10 +272,9 @@ internal constructor(
// remove `is ...` after Gradle Configuration Cache deserialization for Objects of a Sealed Class is fixed
// https://github.com/gradle/gradle/issues/22347
is MACOS_X64, is MACOS_ARM64 -> "MacOSX"
is IOS_ARM32, is IOS_ARM64, is IOS_X64, is IOS_SIMULATOR_ARM64 -> "iPhoneOS"
is IOS_ARM64, is IOS_X64, is IOS_SIMULATOR_ARM64 -> "iPhoneOS"
is TVOS_ARM64, is TVOS_X64, is TVOS_SIMULATOR_ARM64 -> "AppleTVOS"
is WATCHOS_ARM32, is WATCHOS_ARM64, is WATCHOS_X86,
is WATCHOS_X64, is WATCHOS_SIMULATOR_ARM64, is WATCHOS_DEVICE_ARM64 -> "WatchOS"
is WATCHOS_ARM32, is WATCHOS_ARM64, is WATCHOS_X64, is WATCHOS_SIMULATOR_ARM64, is WATCHOS_DEVICE_ARM64 -> "WatchOS"
else -> error("Fat frameworks are not supported for platform `${target.visibleName}`")
}
@@ -462,8 +458,8 @@ internal constructor(
companion object {
private val supportedTargets = listOf(
IOS_ARM32, IOS_ARM64, IOS_X64,
WATCHOS_ARM32, WATCHOS_ARM64, WATCHOS_X86, WATCHOS_X64, WATCHOS_DEVICE_ARM64,
IOS_ARM64, IOS_X64,
WATCHOS_ARM32, WATCHOS_ARM64, WATCHOS_X64, WATCHOS_DEVICE_ARM64,
TVOS_ARM64, TVOS_X64,
MACOS_X64, MACOS_ARM64
)