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

Split shared: Get rid of compiler version in resolvers

Browse Source 
Needed to apply patches from the detached shared
This commit is contained in:
Ilya Matveev
2019-05-27 17:18:33 +03:00
committed by Ilya Matveev
parent 5745b31853
commit 6a770bc12c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
+6 -5
View File
@@ -30,23 +30,24 @@ interface SearchPathResolverWithTarget: SearchPathResolver {
fun defaultResolver( fun defaultResolver(
repositories: List<String>, repositories: List<String>,
target: KonanTarget, target: KonanTarget,
distribution: Distribution = Distribution() distribution: Distribution = Distribution(),
): SearchPathResolverWithTarget = defaultResolver(repositories, emptyList(), target, distribution) compatibleCompilerVersions: List<KonanVersion>
): SearchPathResolverWithTarget = defaultResolver(repositories, emptyList(), target, distribution, compatibleCompilerVersions)
fun defaultResolver( fun defaultResolver(
repositories: List<String>, repositories: List<String>,
directLibs: List<String>, directLibs: List<String>,
target: KonanTarget, target: KonanTarget,
distribution: Distribution, distribution: Distribution,
compatibleCompilerVersions: List<KonanVersion>,
logger: Logger = ::dummyLogger, logger: Logger = ::dummyLogger,
skipCurrentDir: Boolean = false, skipCurrentDir: Boolean = false
compatibleCompilerVersions: List<KonanVersion> = emptyList()
): SearchPathResolverWithTarget = KonanLibraryProperResolver( ): SearchPathResolverWithTarget = KonanLibraryProperResolver(
repositories, repositories,
directLibs, directLibs,
target, target,
listOf(KonanAbiVersion.CURRENT), listOf(KonanAbiVersion.CURRENT),
listOf(KonanVersion.CURRENT) + compatibleCompilerVersions, compatibleCompilerVersions,
distribution.klib, distribution.klib,
distribution.localKonanDir.absolutePath, distribution.localKonanDir.absolutePath,
skipCurrentDir, skipCurrentDir,