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

[Gradle] watchosDeviceArm64 should not run simulator tests

Browse Source 
This reverts commit 640ba1ec

^KT-54583 Verification Pending
This commit is contained in:
Anton Lakotka
2022-10-20 10:26:49 +02:00
committed by Space Team
parent 259d58c817
commit fe2ee9886d
2 changed files with 2 additions and 6 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
-1
View File
@@ -58,7 +58,6 @@ private val nativeTargetsWithSimulatorTests =
KonanTarget.WATCHOS_X86, KonanTarget.WATCHOS_X86,
KonanTarget.WATCHOS_X64, KonanTarget.WATCHOS_X64,
KonanTarget.WATCHOS_SIMULATOR_ARM64, KonanTarget.WATCHOS_SIMULATOR_ARM64,
KonanTarget.WATCHOS_DEVICE_ARM64,
KonanTarget.TVOS_X64, KonanTarget.TVOS_X64,
KonanTarget.TVOS_SIMULATOR_ARM64 KonanTarget.TVOS_SIMULATOR_ARM64
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt
+2 -5
View File
@@ -154,11 +154,8 @@ class KotlinMultiplatformPlugin : Plugin<Project> {
// Note: modifying these sets should also be reflected in the DSL code generator, see 'presetEntries.kt' // Note: modifying these sets should also be reflected in the DSL code generator, see 'presetEntries.kt'
val nativeTargetsWithHostTests = setOf(LINUX_X64, MACOS_X64, MACOS_ARM64, MINGW_X64) val nativeTargetsWithHostTests = setOf(LINUX_X64, MACOS_X64, MACOS_ARM64, MINGW_X64)
val nativeTargetsWithSimulatorTests = setOf( val nativeTargetsWithSimulatorTests =
IOS_X64, IOS_SIMULATOR_ARM64, setOf(IOS_X64, IOS_SIMULATOR_ARM64, WATCHOS_X86, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64, TVOS_X64, TVOS_SIMULATOR_ARM64)
WATCHOS_X86, WATCHOS_X64, WATCHOS_SIMULATOR_ARM64, WATCHOS_DEVICE_ARM64,
TVOS_X64, TVOS_SIMULATOR_ARM64
)
HostManager().targets HostManager().targets
.forEach { (_, konanTarget) -> .forEach { (_, konanTarget) ->