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

Cleanup: drop KlibIrVersion

Browse Source 
Review: https://jetbrains.team/p/kt/reviews/8401
In scope of: KT-55082

Because this version isn't used for anything. We have KotlinAbiVersion
to version the IR format.
This commit is contained in:
Nikita Bobko
2023-01-09 11:25:58 +01:00
parent dff13ec584
commit 62b27b4613
12 changed files with 3 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt
-1
View File
@@ -9,7 +9,6 @@ const val KLIB_PROPERTY_COMPILER_VERSION = "compiler_version"
const val KLIB_PROPERTY_DEPENDENCY_VERSION = "dependency_version"
const val KLIB_PROPERTY_LIBRARY_VERSION = "library_version"
const val KLIB_PROPERTY_METADATA_VERSION = "metadata_version"
const val KLIB_PROPERTY_IR_VERSION = "ir_version"
const val KLIB_PROPERTY_UNIQUE_NAME = "unique_name"
const val KLIB_PROPERTY_SHORT_NAME = "short_name"
const val KLIB_PROPERTY_DEPENDS = "depends"
compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryVersioning.kt
-4
View File
@@ -7,7 +7,6 @@ data class KotlinLibraryVersioning(
val compilerVersion: String?,
val abiVersion: KotlinAbiVersion?,
val metadataVersion: String?,
val irVersion: String?
)
fun Properties.writeKonanLibraryVersioning(versions: KotlinLibraryVersioning) {
@@ -15,7 +14,6 @@ fun Properties.writeKonanLibraryVersioning(versions: KotlinLibraryVersioning) {
versions.libraryVersion?.let { this.setProperty(KLIB_PROPERTY_LIBRARY_VERSION, it) }
versions.compilerVersion?.let { this.setProperty(KLIB_PROPERTY_COMPILER_VERSION, it) }
versions.metadataVersion?.let { this.setProperty(KLIB_PROPERTY_METADATA_VERSION, it) }
versions.irVersion?.let { this.setProperty(KLIB_PROPERTY_IR_VERSION, it) }
}
fun Properties.readKonanLibraryVersioning(): KotlinLibraryVersioning {
@@ -23,13 +21,11 @@ fun Properties.readKonanLibraryVersioning(): KotlinLibraryVersioning {
val libraryVersion = this.getProperty(KLIB_PROPERTY_LIBRARY_VERSION)
val compilerVersion = this.getProperty(KLIB_PROPERTY_COMPILER_VERSION)
val metadataVersion = this.getProperty(KLIB_PROPERTY_METADATA_VERSION)
val irVersion = this.getProperty(KLIB_PROPERTY_IR_VERSION)
return KotlinLibraryVersioning(
abiVersion = abiVersion,
libraryVersion = libraryVersion,
compilerVersion = compilerVersion,
metadataVersion = metadataVersion,
irVersion = irVersion
)
}