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
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropTest.kt
-8
View File
@@ -127,30 +127,23 @@ abstract class AbstractNativeCInteropTest : AbstractNativeCInteropBaseTest() {
KonanTarget.ANDROID_ARM64 -> "ARM64"
KonanTarget.ANDROID_X64 -> "X64"
KonanTarget.ANDROID_X86 -> "CPointerByteVar"
KonanTarget.IOS_ARM32 -> "COpaquePointer"
KonanTarget.IOS_ARM64 -> "CPointerByteVar"
KonanTarget.IOS_SIMULATOR_ARM64 -> "CPointerByteVar"
KonanTarget.IOS_X64 -> "X64"
KonanTarget.LINUX_ARM32_HFP -> "ARM32"
KonanTarget.LINUX_ARM64 -> "ARM64"
KonanTarget.LINUX_MIPS32 -> "COpaquePointer"
KonanTarget.LINUX_MIPSEL32 -> "COpaquePointer"
KonanTarget.LINUX_X64 -> "X64"
KonanTarget.MACOS_ARM64 -> "CPointerByteVar"
KonanTarget.MACOS_X64 -> "X64"
KonanTarget.MINGW_X64 -> "CPointerByteVar"
KonanTarget.MINGW_X86 -> "CPointerByteVar"
KonanTarget.TVOS_ARM64 -> "CPointerByteVar"
KonanTarget.TVOS_SIMULATOR_ARM64 -> "CPointerByteVar"
KonanTarget.TVOS_X64 -> "X64"
KonanTarget.WASM32 -> "COpaquePointer"
KonanTarget.WATCHOS_ARM32 -> "CPointerByteVar"
KonanTarget.WATCHOS_ARM64 -> "CPointerByteVar"
KonanTarget.WATCHOS_DEVICE_ARM64 -> "CPointerByteVar"
KonanTarget.WATCHOS_SIMULATOR_ARM64 -> "CPointerByteVar"
KonanTarget.WATCHOS_X64 -> "X64"
KonanTarget.WATCHOS_X86 -> "CPointerByteVar"
is KonanTarget.ZEPHYR -> "COpaquePointer"
}
return testPathFull.resolve("contents.gold.${goldenFilePart}.txt")
}
@@ -172,4 +165,3 @@ internal fun muteCInteropTestIfNecessary(defFile: File, target: KonanTarget) {
}
}
//Assumptions.assumeFalse(defHasObjC && !targets.testTarget.family.isAppleFamily)
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/CompressedNames.kt
-5
View File
@@ -30,8 +30,6 @@ internal val Family.compressedName: Char
Family.LINUX -> 'l'
Family.MINGW -> 'm'
Family.ANDROID -> 'a'
Family.WASM -> 'j' // because 'w', 'a' and 'm' are already occupied
Family.ZEPHYR -> 'z'
}
internal val Architecture.compressedName: String
@@ -40,9 +38,6 @@ internal val Architecture.compressedName: String
Architecture.X86 -> "x86"
Architecture.ARM64 -> "a64"
Architecture.ARM32 -> "a32"
Architecture.MIPS32 -> "m32"
Architecture.MIPSEL32 -> "e32"
Architecture.WASM32 -> "w32"
}
internal val Class<*>.compressedSimpleName: String