Merge KT-MR-3320 from rra/sellmair/kt-46957-enable_linuxMips32_in_tests
This commit is contained in:
+1
-1
@@ -186,7 +186,7 @@ extra["versions.kotlinx-collections-immutable-jvm"] = immutablesVersion
|
|||||||
extra["versions.ktor-network"] = "1.0.1"
|
extra["versions.ktor-network"] = "1.0.1"
|
||||||
|
|
||||||
if (!project.hasProperty("versions.kotlin-native")) {
|
if (!project.hasProperty("versions.kotlin-native")) {
|
||||||
extra["versions.kotlin-native"] = "1.5.20-dev-5613"
|
extra["versions.kotlin-native"] = "1.5.30-dev-1916"
|
||||||
}
|
}
|
||||||
|
|
||||||
val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false)
|
val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false)
|
||||||
|
|||||||
-4
@@ -9,10 +9,6 @@ plugins {
|
|||||||
kotlin {
|
kotlin {
|
||||||
presets.forEach { preset ->
|
presets.forEach { preset ->
|
||||||
if (preset is AbstractKotlinNativeTargetPreset) {
|
if (preset is AbstractKotlinNativeTargetPreset) {
|
||||||
// https://youtrack.jetbrains.com/issue/KT-46957
|
|
||||||
if (hostIsLinux && preset.konanTarget == LINUX_MIPS32) {
|
|
||||||
return@forEach
|
|
||||||
}
|
|
||||||
targetFromPreset(preset)
|
targetFromPreset(preset)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user