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

Increase metadata version to 1.1, hardcode incompatibility with 1.0

Browse Source 
Add a temporary option to suppress incompatibility errors when compiling Kotlin
against current IDEA libraries until they are migrated
This commit is contained in:
Alexander Udalov
2016-01-22 17:25:09 +03:00
parent 13b1e91eb5
commit 7981e5aa3a
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt
+7 -2
View File
@@ -23,11 +23,16 @@ import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion
* This version includes the version of the core protobuf messages (descriptors.proto) as well as JVM extensions (jvm_descriptors.proto).
*/
class JvmMetadataVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
override fun isCompatible() = this.isCompatibleTo(INSTANCE)
// NOTE: 1.1 is incompatible with 1.0 and hence with any other version except 1.1.*
override fun isCompatible() =
skipCheck || (this.major == 1 && this.minor == 1)
companion object {
// TODO: this is a temporary hack which can be removed once we migrate the IDEA code from 1.0 to 1.1
var skipCheck: Boolean = false
@JvmField
val INSTANCE = JvmMetadataVersion(1, 0, 2)
val INSTANCE = JvmMetadataVersion(1, 1, 0)
@JvmField
val INVALID_VERSION = JvmMetadataVersion()