From 5f2a9630069f80d260c721ea6f60ccfb59db3728 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Fri, 6 Nov 2020 14:41:50 +0300 Subject: [PATCH] Better wording and comments for klib compatibility code --- .../src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt | 2 ++ .../src/org/jetbrains/kotlin/library/SearchPathResolver.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 fffc949035c..ea12420331a 100644 --- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt +++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt @@ -36,6 +36,8 @@ data class KotlinAbiVersion(val major: Int, val minor: Int, val patch: Int) { fun isCompatible(): Boolean = isCompatibleTo(CURRENT) private fun isCompatibleTo(ourVersion: KotlinAbiVersion): Boolean { + // Versions before 1.4.1 were the active development phase. + // Starting with 1.4.1 we are trying to maintain some backward compatibility. return if (this.isAtLeast(1, 4, 1)) major == ourVersion.major && minor <= ourVersion.minor else diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt index c5957f82f2e..d82138c6964 100644 --- a/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt +++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt @@ -225,7 +225,7 @@ abstract class KotlinLibraryProperResolverWithAttributes( val candidateLibraryVersion = candidate.versions.libraryVersion if (candidateAbiVersion?.isCompatible() != true) { - logger.warning("skipping $candidatePath. Incompatible abi version. Expected '${KotlinAbiVersion.CURRENT}', found '${candidateAbiVersion}'. The library produced by ${candidateCompilerVersion} compiler") + logger.warning("skipping $candidatePath. Incompatible abi version. The current default is '${KotlinAbiVersion.CURRENT}', found '${candidateAbiVersion}'. The library produced by ${candidateCompilerVersion} compiler") return false }