From dbc66bd0ae943d83530ac113609ab237f9e03f4c Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 7 Mar 2019 12:59:27 +0700 Subject: [PATCH] Native: Support 2- and 3-digit Kotlin/Native versions --- .../library/lite/LiteKonanDistributionInfoProvider.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionInfoProvider.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionInfoProvider.kt index 830ca246844..78e1b49a42c 100644 --- a/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionInfoProvider.kt +++ b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionInfoProvider.kt @@ -19,7 +19,13 @@ class LiteKonanDistributionInfoProvider(private val konanHomeDir: String) { val versionString = stdlibInfo.compilerVersion val version = versionString.substringBefore('-') .split('.') - .takeIf { it.size == 3 } + .let { + when (it.size) { + 2 -> listOf(it[0], it[1], "0") + 3 -> it + else -> null + } + } ?.mapNotNull { it.toIntOrNull() } ?.takeIf { it.size == 3 } ?.let {