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

A little refactoring on abi version match.

Browse Source
This commit is contained in:
Alexander Gorshenev
2018-10-17 19:21:31 +03:00
committed by alexander-gorshenev
parent 4bc1130a95
commit be56d8a4e2
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
+15 -9
View File
@@ -208,18 +208,24 @@ internal fun SearchPathResolverWithTarget.libraryMatch(candidate: KonanLibraryIm
return false return false
} }
if (candidateAbiVersion == null || val abiVersionMatch = candidateAbiVersion != null &&
knownAbiVersions != null && knownAbiVersions != null &&
!knownAbiVersions!!.contains(candidateAbiVersion)) { knownAbiVersions!!.contains(candidateAbiVersion)
if (candidateCompilerVersion == null || val compilerVersionMatch = candidateCompilerVersion != null &&
knownCompilerVersions != null && knownCompilerVersions != null &&
knownCompilerVersions!!.none { it.compatible(candidateCompilerVersion) } ) { knownCompilerVersions!!.any { it.compatible(candidateCompilerVersion) }
logger("skipping $candidatePath. The abi versions don't match. Expected '${knownAbiVersions}', found '${candidateAbiVersion}'") if (!abiVersionMatch && !compilerVersionMatch) {
if (knownCompilerVersions != null) logger("The compiler versions don't match either. Expected '${knownCompilerVersions?.map { it.toString(false, false) }}', found '${candidateCompilerVersion?.toString(true, true)}'") logger("skipping $candidatePath. The abi versions don't match. Expected '${knownAbiVersions}', found '${candidateAbiVersion}'")
return false
if (knownCompilerVersions != null) {
val expected = knownCompilerVersions?.map { it.toString(false, false) }
val found = candidateCompilerVersion?.toString(true, true)
logger("The compiler versions don't match either. Expected '${expected}', found '${found}'")
} }
return false
} }
if (candidateLibraryVersion != unresolved.libraryVersion && if (candidateLibraryVersion != unresolved.libraryVersion &&