Don't pass current version to library resolvers as a compatible one

This commit is contained in:
Ilya Matveev
2019-06-19 15:50:02 +07:00
committed by Ilya Matveev
parent 3d6d8b4d6b
commit ff7a0e23bf
6 changed files with 15 additions and 19 deletions
@@ -104,7 +104,7 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
libraryNames.filter { it.contains(File.separator) },
target,
distribution,
compatibleCompilerVersions + KonanVersion.CURRENT,
compatibleCompilerVersions,
resolverLogger
).libraryResolver()
@@ -36,7 +36,7 @@ fun defaultResolver(
repositories: List<String>,
target: KonanTarget,
distribution: Distribution = Distribution(),
compatibleCompilerVersions: List<KonanVersion>
compatibleCompilerVersions: List<KonanVersion> = emptyList()
): SearchPathResolverWithTarget = defaultResolver(repositories, emptyList(), target, distribution, compatibleCompilerVersions)
fun defaultResolver(
@@ -44,7 +44,7 @@ fun defaultResolver(
directLibs: List<String>,
target: KonanTarget,
distribution: Distribution,
compatibleCompilerVersions: List<KonanVersion>,
compatibleCompilerVersions: List<KonanVersion> = emptyList(),
logger: Logger = DummyLogger,
skipCurrentDir: Boolean = false
): SearchPathResolverWithTarget = KonanLibraryProperResolver(
@@ -145,12 +145,11 @@ open class KonanLibrariesSpec(val task: KonanArtifactWithLibrariesTask, val proj
}
fun asFiles(): List<File> = asFiles(
defaultResolver(
repos.map { it.absolutePath },
task.konanTarget,
Distribution(konanHomeOverride = project.konanHome),
listOf(KonanVersion.CURRENT)
)
defaultResolver(
repos.map { it.absolutePath },
task.konanTarget,
Distribution(konanHomeOverride = project.konanHome)
)
)
fun asFiles(resolver: SearchPathResolver): List<File> = mutableListOf<File>().apply {
@@ -235,10 +235,9 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
override fun toModelArtifact(): KonanModelArtifact {
val repos = libraries.repos
val resolver = defaultResolver(
repos.map { it.absolutePath },
konanTarget,
Distribution(konanHomeOverride = project.konanHome),
listOf(KonanVersion.CURRENT)
repos.map { it.absolutePath },
konanTarget,
Distribution(konanHomeOverride = project.konanHome)
)
return KonanModelArtifactImpl(
@@ -171,10 +171,9 @@ open class KonanInteropTask @Inject constructor(val workerExecutor: WorkerExecut
override fun toModelArtifact(): KonanModelArtifact {
val repos = libraries.repos
val resolver = defaultResolver(
repos.map { it.absolutePath },
konanTarget,
Distribution(konanHomeOverride = project.konanHome),
listOf(KonanVersion.CURRENT)
repos.map { it.absolutePath },
konanTarget,
Distribution(konanHomeOverride = project.konanHome)
)
return KonanModelArtifactImpl(
@@ -50,8 +50,7 @@ fun invokeInterop(flavor: String, args: Array<String>): Array<String>? {
repos,
libraries.filter { it.contains(File.separator) },
target,
Distribution(),
listOf(KonanVersion.CURRENT)
Distribution()
).libraryResolver()
val allLibraries = resolver.resolveWithDependencies(
libraries.toUnresolvedLibraries, noStdLib = true, noDefaultLibs = noDefaultLibs