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

Initial implementation of klib components

Browse Source
This commit is contained in:
Alexander Gorshenev
2020-01-14 15:58:48 +03:00
committed by alexander-gorshenev
parent f949b48b4a
commit ccf084b1a5
10 changed files with 92 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt
+4 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.library.KotlinLibrary
import org.jetbrains.kotlin.library.KotlinLibraryVersioning
import org.jetbrains.kotlin.library.SerializedMetadata
import org.jetbrains.kotlin.library.impl.buildKoltinLibrary
import org.jetbrains.kotlin.library.impl.createKotlinLibrary
import org.jetbrains.kotlin.library.impl.createKotlinLibraryComponents
import org.jetbrains.kotlin.library.metadata.parseModuleHeader
import org.jetbrains.kotlin.metadata.builtins.BuiltInsBinaryVersion
import org.jetbrains.kotlin.name.Name
@@ -110,7 +110,9 @@ private class KlibMetadataDependencyContainer(
val klibFiles = classpathFiles
.filter { it.extension == "klib" || it.isDirectory }
klibFiles.map { createKotlinLibrary(org.jetbrains.kotlin.konan.file.File(it.absolutePath)) }
// TODO: need to move K2Metadata to SearchPathResolver.
// Otherewise there's no good way to choose between the components.
klibFiles.map { createKotlinLibraryComponents(org.jetbrains.kotlin.konan.file.File(it.absolutePath)).single() }
}
private val builtIns