From b06a3ea5acb205aa32163970268c8df3abc41e46 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Fri, 6 Mar 2020 17:21:19 +0300 Subject: [PATCH] Print out abi version as a full triple --- .../org/jetbrains/kotlin/library/KotlinAbiVersion.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt index 7dc237fe253..46e079d200a 100644 --- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt +++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt @@ -26,13 +26,13 @@ fun String.parseKotlinAbiVersion(): KotlinAbiVersion { } } -// We still enumerate klib abi_version with a single number, -// but we don't break if in the future we switch to triples. +// For 1.4 compiler we switch klib abi_version to a triple, +// but we don't break if we still encounter a single digit from 1.3. data class KotlinAbiVersion(val major: Int, val minor: Int, val patch: Int) { constructor(single: Int) : this(0, single, 0) companion object { - val CURRENT = KotlinAbiVersion(26) + val CURRENT = KotlinAbiVersion(1, 4, 0) } - override fun toString() = if (major == 0 && patch == 0) "$minor" else "$major.$minor.$patch" -} \ No newline at end of file + override fun toString() = "$major.$minor.$patch" +}