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

Minor: Formatted

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-01-29 21:53:39 +07:00
parent 8028a3f55b
commit 1053428ee4
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
+3 -3
View File
@@ -190,8 +190,7 @@ abstract class KotlinLibraryProperResolverWithAttributes<L: KotlinLibrary>(
override val logger: Logger, override val logger: Logger,
private val knownIrProviders: List<String> private val knownIrProviders: List<String>
) : KotlinLibrarySearchPathResolver<L>(repositories, directLibs, distributionKlib, localKotlinDir, skipCurrentDir, logger), ) : KotlinLibrarySearchPathResolver<L>(repositories, directLibs, distributionKlib, localKotlinDir, skipCurrentDir, logger),
SearchPathResolverWithAttributes<L> SearchPathResolverWithAttributes<L> {
{
override fun libraryMatch(candidate: L, unresolved: UnresolvedLibrary): Boolean { override fun libraryMatch(candidate: L, unresolved: UnresolvedLibrary): Boolean {
val candidatePath = candidate.libraryFile.absolutePath val candidatePath = candidate.libraryFile.absolutePath
@@ -239,7 +238,8 @@ class SingleKlibComponentResolver(
override fun libraryComponentBuilder(file: File, isDefault: Boolean) = createKotlinLibraryComponents(file, isDefault) override fun libraryComponentBuilder(file: File, isDefault: Boolean) = createKotlinLibraryComponents(file, isDefault)
} }
fun resolveSingleFileKlib(libraryFile: File, fun resolveSingleFileKlib(
libraryFile: File,
logger: Logger = object : Logger { logger: Logger = object : Logger {
override fun log(message: String) {} override fun log(message: String) {}
override fun error(message: String) = kotlin.error("e: $message") override fun error(message: String) = kotlin.error("e: $message")