Splitted library writer into kotlin and konan parts

Moved to util-io and util-klib for klib code commonization
Moved the common writer to Kotlin workspace
This commit is contained in:
Alexander Gorshenev
2019-05-14 16:15:42 +03:00
committed by alexander-gorshenev
parent 63d763338d
commit df02804be1
36 changed files with 332 additions and 658 deletions
@@ -2,7 +2,7 @@ package org.jetbrains.kotlin.konan.library.resolver
import org.jetbrains.kotlin.konan.library.KonanLibrary
import org.jetbrains.kotlin.konan.library.SearchPathResolverWithTarget
import org.jetbrains.kotlin.konan.library.UnresolvedLibrary
import org.jetbrains.kotlin.library.UnresolvedLibrary
interface KonanLibraryResolver {
@@ -13,9 +13,9 @@ interface KonanLibraryResolver {
* resolves libraries and evaluates dependencies between them.
*/
fun resolveWithDependencies(
unresolvedLibraries: List<UnresolvedLibrary>,
noStdLib: Boolean = false,
noDefaultLibs: Boolean = false
unresolvedLibraries: List<UnresolvedLibrary>,
noStdLib: Boolean = false,
noDefaultLibs: Boolean = false
): KonanLibraryResolveResult
}
@@ -20,15 +20,17 @@ import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.konan.library.*
import org.jetbrains.kotlin.konan.library.resolver.*
import org.jetbrains.kotlin.konan.util.WithLogger
import org.jetbrains.kotlin.library.UnresolvedLibrary
import org.jetbrains.kotlin.library.unresolvedDependencies
internal class KonanLibraryResolverImpl(
override val searchPathResolver: SearchPathResolverWithTarget
): KonanLibraryResolver, WithLogger by searchPathResolver {
override fun resolveWithDependencies(
unresolvedLibraries: List<UnresolvedLibrary>,
noStdLib: Boolean,
noDefaultLibs: Boolean
unresolvedLibraries: List<UnresolvedLibrary>,
noStdLib: Boolean,
noDefaultLibs: Boolean
) = findLibraries(unresolvedLibraries, noStdLib, noDefaultLibs)
.leaveDistinct()
.resolveDependencies()