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

Fine tune the abi version check for 1.0.x

Browse Source
This commit is contained in:
Alexander Gorshenev
2018-10-17 18:41:59 +03:00
committed by alexander-gorshenev
parent 284235cb44
commit 4bc1130a95
1 changed files with 9 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
+9 -9
View File
@@ -208,18 +208,18 @@ internal fun SearchPathResolverWithTarget.libraryMatch(candidate: KonanLibraryIm
return false
}
if (candidateCompilerVersion == null ||
knownCompilerVersions != null &&
knownCompilerVersions!!.none { it.compatible(candidateCompilerVersion) } ) {
logger("skipping $candidatePath. The compiler versions don't match. Expected '${knownCompilerVersions?.map { it.toString(false, false) }}', found '${candidateCompilerVersion?.toString(true, true)}'")
return false
}
if (candidateAbiVersion == null ||
knownAbiVersions != null &&
!knownAbiVersions!!.contains(candidateAbiVersion)) {
logger("skipping $candidatePath. The abi versions don't match. Expected '${knownAbiVersions}', found '${candidateAbiVersion}'")
return false
if (candidateCompilerVersion == null ||
knownCompilerVersions != null &&
knownCompilerVersions!!.none { it.compatible(candidateCompilerVersion) } ) {
logger("skipping $candidatePath. The abi versions don't match. Expected '${knownAbiVersions}', found '${candidateAbiVersion}'")
if (knownCompilerVersions != null) logger("The compiler versions don't match either. Expected '${knownCompilerVersions?.map { it.toString(false, false) }}', found '${candidateCompilerVersion?.toString(true, true)}'")
return false
}
}
if (candidateLibraryVersion != unresolved.libraryVersion &&