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

Fine tuned the single file klib resolver

Browse Source
This commit is contained in:
Alexander Gorshenev
2020-01-21 14:52:18 +03:00
committed by alexander-gorshenev
parent fcce35c06f
commit 19cbdb096f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
+2 -2
View File
@@ -233,7 +233,7 @@ class SingleKlibComponentResolver(
logger: Logger logger: Logger
) : KotlinLibraryProperResolverWithAttributes<KotlinLibrary>( ) : KotlinLibraryProperResolverWithAttributes<KotlinLibrary>(
emptyList(), listOf(klibFile), knownAbiVersions, emptyList(), emptyList(), listOf(klibFile), knownAbiVersions, emptyList(),
null, null, true, logger, emptyList() null, null, false, logger, emptyList()
) { ) {
override fun libraryComponentBuilder(file: File, isDefault: Boolean) = createKotlinLibraryComponents(file, isDefault) override fun libraryComponentBuilder(file: File, isDefault: Boolean) = createKotlinLibraryComponents(file, isDefault)
} }
@@ -246,5 +246,5 @@ fun resolveSingleFileKlib(libraryFile: File,
override fun fatal(message: String) = kotlin.error("e: $message") override fun fatal(message: String) = kotlin.error("e: $message")
} }
): KotlinLibrary { ): KotlinLibrary {
return SingleKlibComponentResolver(libraryFile.absolutePath, emptyList(), logger).resolve(libraryFile.absolutePath) return SingleKlibComponentResolver(libraryFile.absolutePath, listOf(KotlinAbiVersion.CURRENT), logger).resolve(libraryFile.absolutePath)
} }