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

Only allow version triples for klib metadata and ir versions

Browse Source
This commit is contained in:
Alexander Gorshenev
2019-11-28 16:55:56 +03:00
committed by alexander-gorshenev
parent b0f077ff4b
commit a923e0d130
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KlibIrVersion.kt
+7 -2
View File
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.library.KLIB_PROPERTY_IR_VERSION
import org.jetbrains.kotlin.library.KotlinLibrary
import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
class KlibIrVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
class KlibIrVersion(major: Int, minor: Int, patch: Int) : BinaryVersion(major, minor, patch) {
override fun isCompatible(): Boolean = isCompatibleTo(INSTANCE)
@@ -18,10 +18,15 @@ class KlibIrVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
}
}
fun KlibIrVersion(vararg values: Int): KlibIrVersion {
if (values.size != 3) error("Ir version should be in major.minor.patch format: $values")
return KlibIrVersion(values[0], values[1], values[2])
}
val KotlinLibrary.metadataVersion: KlibIrVersion
get() {
val versionString = manifestProperties.getProperty(KLIB_PROPERTY_IR_VERSION)
val versionIntArray = BinaryVersion.parseVersionArray(versionString)
?: error("Could not parse metadata version: $versionString")
?: error("Could not parse ir version: $versionString")
return KlibIrVersion(*versionIntArray)
}