Cleanup: drop KlibIrVersion
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:
-2
@@ -10,7 +10,6 @@ import kotlinx.metadata.klib.KlibModuleFragmentWriteStrategy
|
||||
import kotlinx.metadata.klib.KlibModuleMetadata
|
||||
import kotlinx.metadata.klib.className
|
||||
import kotlinx.metadata.klib.fqName
|
||||
import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion
|
||||
import org.jetbrains.kotlin.config.KotlinCompilerVersion
|
||||
import org.jetbrains.kotlin.konan.file.File
|
||||
import org.jetbrains.kotlin.konan.library.impl.KonanLibraryLayoutForWriter
|
||||
@@ -42,7 +41,6 @@ fun createInteropLibrary(
|
||||
abiVersion = KotlinAbiVersion.CURRENT,
|
||||
compilerVersion = KotlinCompilerVersion.VERSION,
|
||||
metadataVersion = KlibMetadataVersion.INSTANCE.toString(),
|
||||
irVersion = KlibIrVersion.INSTANCE.toString()
|
||||
)
|
||||
val libFile = File(outputPath)
|
||||
val unzippedDir = if (nopack) libFile else org.jetbrains.kotlin.konan.file.createTempDir("klib")
|
||||
|
||||
-3
@@ -5,7 +5,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.backend.konan.driver.phases
|
||||
|
||||
import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion
|
||||
import org.jetbrains.kotlin.backend.konan.KonanConfigKeys
|
||||
import org.jetbrains.kotlin.backend.konan.OutputFiles
|
||||
import org.jetbrains.kotlin.backend.konan.driver.PhaseContext
|
||||
@@ -30,13 +29,11 @@ internal val WriteKlibPhase = createSimpleNamedCompilerPhase<PhaseContext, Seria
|
||||
val compilerVersion = KotlinCompilerVersion.getVersion().toString()
|
||||
val libraryVersion = configuration.get(KonanConfigKeys.LIBRARY_VERSION)
|
||||
val metadataVersion = KlibMetadataVersion.INSTANCE.toString()
|
||||
val irVersion = KlibIrVersion.INSTANCE.toString()
|
||||
val versions = KotlinLibraryVersioning(
|
||||
abiVersion = abiVersion,
|
||||
libraryVersion = libraryVersion,
|
||||
compilerVersion = compilerVersion,
|
||||
metadataVersion = metadataVersion,
|
||||
irVersion = irVersion
|
||||
)
|
||||
val target = config.target
|
||||
val manifestProperties = config.manifestProperties
|
||||
|
||||
@@ -116,7 +116,6 @@ class Library(val libraryNameOrPath: String, val requestedRepository: String?, v
|
||||
val headerCompilerVersion = library.versions.compilerVersion
|
||||
val headerLibraryVersion = library.versions.libraryVersion
|
||||
val headerMetadataVersion = library.versions.metadataVersion
|
||||
val headerIrVersion = library.versions.irVersion
|
||||
val moduleName = ModuleDeserializer(library.moduleHeaderData).moduleName
|
||||
|
||||
println("")
|
||||
@@ -126,7 +125,6 @@ class Library(val libraryNameOrPath: String, val requestedRepository: String?, v
|
||||
println("Compiler version: ${headerCompilerVersion}")
|
||||
println("Library version: $headerLibraryVersion")
|
||||
println("Metadata version: $headerMetadataVersion")
|
||||
println("IR version: $headerIrVersion")
|
||||
|
||||
if (library is KonanLibrary) {
|
||||
val targets = library.targetList.joinToString(", ")
|
||||
|
||||
Reference in New Issue
Block a user