commit 3556533d955a8fb561c4fb8d6b37b04b8b48f205
author Troels Bjerre Lund <troels@google.com> Tue Oct 24 10:55:26 2023 +0200
committer Space Cloud <noreply@jetbrains.space> Tue Oct 24 14:00:34 2023 +0000
tree c3b370046728425949a95373fc12473a011fb811
parent 56f53fbd0b6511da7bde7af443fb71a86150a894

[K/N] Fix K2 detection in native tests

This updates how the requested language version is detected in native
tests, after language version 2 has become the default.

kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt

diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt
index 5848009..6cf57bc 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt
@@ -53,12 +53,9 @@
 
     @JvmStatic
     fun isK2(project: Project): Boolean {
-        return project.globalTestArgs.contains("-language-version") &&
-                // Enough future versions are specified until K1 will be stopped to test
-                (project.globalTestArgs.contains("2.0")
-                        || project.globalTestArgs.contains("2.1")
-                        || project.globalTestArgs.contains("2.2")
-                        )
+        val idx = project.globalTestArgs.indexOf("-language-version")
+        if (idx == -1) return true
+        return project.globalTestArgs[idx + 1].toDouble() >= 2.0
     }
 
     @JvmStatic