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

A native counterpart for plubing metadata and ir versions to klib manifest

Browse Source 
(cherry picked from commit 06a515393df6c1c071a551353a2a82fd2252a24c)
This commit is contained in:
Alexander Gorshenev
2019-11-28 03:17:32 +03:00
committed by Vasily Levchenko
parent aafe34db13
commit fcba683e72
17 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt
+9 -5
View File
@@ -4,12 +4,14 @@
*/
package org.jetbrains.kotlin.native.interop.gen.jvm
import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion
import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataVersion
import org.jetbrains.kotlin.konan.CompilerVersion
import org.jetbrains.kotlin.konan.CURRENT
import org.jetbrains.kotlin.konan.KonanVersion
import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.konan.library.impl.KonanLibraryWriterImpl
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.library.KonanLibraryVersioning
import org.jetbrains.kotlin.library.KotlinLibraryVersioning
import org.jetbrains.kotlin.library.KotlinAbiVersion
import java.util.*
@@ -22,10 +24,12 @@ data class LibraryCreationArguments(
)
fun createInteropLibrary(arguments: LibraryCreationArguments) {
val version = KonanLibraryVersioning(
val version = KotlinLibraryVersioning(
libraryVersion = null,
abiVersion = KotlinAbiVersion.CURRENT,
compilerVersion = KonanVersion.CURRENT
compilerVersion = CompilerVersion.CURRENT.toString(),
metadataVersion = KlibMetadataVersion.INSTANCE.toString(),
irVersion = KlibIrVersion.INSTANCE.toString()
)
KonanLibraryWriterImpl(
File(arguments.outputPath),arguments.moduleName, version, arguments.target
@@ -34,4 +38,4 @@ fun createInteropLibrary(arguments: LibraryCreationArguments) {
addManifestAddend(arguments.manifest)
commit()
}
}
}