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

[Gradle] Support for Apple Silicon targets

Browse Source 
^KT-45302 Verification Pending
This commit is contained in:
sebastian.sellmair
2021-05-17 15:42:22 +02:00
committed by Space
parent 91e47f1fd7
commit 5dcaaf47cb
5 changed files with 108 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt
+14 -3
View File
@@ -48,9 +48,20 @@ internal val androidPresetEntry = KotlinPresetEntry(
)
// Note: modifying these sets should also be reflected in the MPP plugin code, see 'setupDefaultPresets'
private val nativeTargetsWithHostTests = setOf(KonanTarget.LINUX_X64, KonanTarget.MACOS_X64, KonanTarget.MINGW_X64)
private val nativeTargetsWithHostTests =
setOf(KonanTarget.LINUX_X64, KonanTarget.MACOS_X64, KonanTarget.MACOS_ARM64, KonanTarget.MINGW_X64)
private val nativeTargetsWithSimulatorTests =
setOf(KonanTarget.IOS_X64, KonanTarget.WATCHOS_X86, KonanTarget.WATCHOS_X64, KonanTarget.TVOS_X64)
setOf(
KonanTarget.IOS_X64,
KonanTarget.IOS_SIMULATOR_ARM64,
KonanTarget.WATCHOS_X86,
KonanTarget.WATCHOS_X64,
KonanTarget.WATCHOS_SIMULATOR_ARM64,
KonanTarget.TVOS_X64,
KonanTarget.TVOS_SIMULATOR_ARM64
)
internal val nativePresetEntries = HostManager().targets
.map { (_, target) ->
@@ -70,4 +81,4 @@ internal val nativePresetEntries = HostManager().targets
internal val allPresetEntries = listOf(
jvmPresetEntry,
androidPresetEntry
) + nativePresetEntries
) + nativePresetEntries