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

Update metadata related logic after switch to 1.6

Browse Source
This commit is contained in:
Mikhael Bogdanov
2021-06-30 16:05:26 +02:00
parent ee07ff7982
commit a919aab3ab
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+2 -2
View File
@@ -405,8 +405,8 @@ class GenerationState private constructor(
this[KOTLIN_1_2] = oldMetadataVersion this[KOTLIN_1_2] = oldMetadataVersion
this[KOTLIN_1_3] = oldMetadataVersion this[KOTLIN_1_3] = oldMetadataVersion
this[KOTLIN_1_4] = JvmMetadataVersion(1, 4, 3) this[KOTLIN_1_4] = JvmMetadataVersion(1, 4, 3)
this[KOTLIN_1_5] = JvmMetadataVersion.INSTANCE this[KOTLIN_1_5] = JvmMetadataVersion(1, 5, 1)
this[KOTLIN_1_6] = JvmMetadataVersion(1, 6, 0) this[KOTLIN_1_6] = JvmMetadataVersion.INSTANCE
this[KOTLIN_1_7] = JvmMetadataVersion(1, 7, 0) this[KOTLIN_1_7] = JvmMetadataVersion(1, 7, 0)
check(size == LanguageVersion.values().size) { check(size == LanguageVersion.values().size) {
core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class JvmMetadataVersion(versionArray: IntArray, val isStrictSemantics: Boolean)
companion object { companion object {
@JvmField @JvmField
val INSTANCE = JvmMetadataVersion(1, 5, 1) val INSTANCE = JvmMetadataVersion(1, 6, 0)
@JvmField @JvmField
val INVALID_VERSION = JvmMetadataVersion() val INVALID_VERSION = JvmMetadataVersion()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
+2 -1
View File
@@ -162,7 +162,8 @@ private val apiVersionValues = ApiVersion.run {
KOTLIN_1_2, KOTLIN_1_2,
KOTLIN_1_3, KOTLIN_1_3,
KOTLIN_1_4, KOTLIN_1_4,
KOTLIN_1_5 KOTLIN_1_5,
KOTLIN_1_6
) )
} }