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

K1/K2: set language version explicitly in Native tests pipeline

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-07-17 16:07:21 +02:00
committed by Space Team
parent 7620289f6f
commit 08222c83cf
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestProcessSettings.kt
+11 -2
View File
@@ -259,9 +259,18 @@ internal sealed class CacheMode {
} }
} }
private fun KotlinVersion.toCanonicalString(): String =
"$major.$minor"
internal enum class PipelineType(val mutedOption: MutedOption, val compilerFlags: List<String>) { internal enum class PipelineType(val mutedOption: MutedOption, val compilerFlags: List<String>) {
K1(MutedOption.K1, emptyList()), K1(
K2(MutedOption.K2, listOf("-language-version", "2.0")); MutedOption.K1,
listOf("-language-version", "1.9")
),
K2(
MutedOption.K2,
listOf("-language-version", if (KotlinVersion.CURRENT.major < 2) "2.0" else KotlinVersion.CURRENT.toCanonicalString())
);
override fun toString() = if (compilerFlags.isEmpty()) "" else compilerFlags.joinToString(prefix = "(", postfix = ")", separator = " ") override fun toString() = if (compilerFlags.isEmpty()) "" else compilerFlags.joinToString(prefix = "(", postfix = ")", separator = " ")
} }