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

[K/N] SearchPathResolver: Do not emit warning for LenientUnresolvedLibrary

Browse Source 
^KT-56205 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-01-26 10:06:50 +01:00
committed by Space Team
parent 48b1456290
commit 1978566fee
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
+1 -6
View File
@@ -162,17 +162,12 @@ abstract class KotlinLibrarySearchPathResolver<L : KotlinLibrary>(
} }
override fun resolve(unresolved: LenientUnresolvedLibrary, isDefaultLink: Boolean): L? { override fun resolve(unresolved: LenientUnresolvedLibrary, isDefaultLink: Boolean): L? {
return resolveOrNull(unresolved, isDefaultLink).also { resolvedLibrary -> return resolveOrNull(unresolved, isDefaultLink)
if (resolvedLibrary == null) {
logger.warning("Could not find \"${unresolved.path}\" in ${searchRoots.map { it.absolutePath }}")
}
}
} }
override fun resolve(unresolved: RequiredUnresolvedLibrary, isDefaultLink: Boolean): L { override fun resolve(unresolved: RequiredUnresolvedLibrary, isDefaultLink: Boolean): L {
return resolveOrNull(unresolved, isDefaultLink) return resolveOrNull(unresolved, isDefaultLink)
?: logger.fatal("Could not find \"${unresolved.path}\" in ${searchRoots.map { it.absolutePath }}") ?: logger.fatal("Could not find \"${unresolved.path}\" in ${searchRoots.map { it.absolutePath }}")
} }
override fun libraryMatch(candidate: L, unresolved: UnresolvedLibrary): Boolean = true override fun libraryMatch(candidate: L, unresolved: UnresolvedLibrary): Boolean = true