[K/N] Adjust moved special backend checks tests
^KT-61564
This commit is contained in:
committed by
Space Team
parent
8f12bf6cc8
commit
08bc0a6bd0
+8
-3
@@ -22,12 +22,14 @@ object CommonKLibResolver {
|
||||
logger: Logger,
|
||||
zipAccessor: ZipFileSystemAccessor? = null,
|
||||
lenient: Boolean = false,
|
||||
knownIrProviders: List<String> = listOf(),
|
||||
): KotlinLibraryResolveResult =
|
||||
resolveWithoutDependencies(
|
||||
libraries,
|
||||
logger,
|
||||
zipAccessor,
|
||||
lenient,
|
||||
knownIrProviders,
|
||||
).resolveWithDependencies()
|
||||
|
||||
fun resolveWithoutDependencies(
|
||||
@@ -35,6 +37,7 @@ object CommonKLibResolver {
|
||||
logger: Logger,
|
||||
zipAccessor: ZipFileSystemAccessor?,
|
||||
lenient: Boolean = false,
|
||||
knownIrProviders: List<String> = listOf(),
|
||||
): KLibResolution {
|
||||
val unresolvedLibraries = libraries.map { UnresolvedLibrary(it, null, lenient) }
|
||||
val libraryAbsolutePaths = libraries.map { File(it).absolutePath }
|
||||
@@ -46,7 +49,8 @@ object CommonKLibResolver {
|
||||
localKotlinDir = null,
|
||||
skipCurrentDir = false,
|
||||
logger = logger,
|
||||
zipAccessor = zipAccessor
|
||||
zipAccessor = zipAccessor,
|
||||
knownIrProviders = knownIrProviders,
|
||||
).libraryResolver()
|
||||
|
||||
return KLibResolution(
|
||||
@@ -79,7 +83,8 @@ private class KLibResolverHelper(
|
||||
localKotlinDir: String?,
|
||||
skipCurrentDir: Boolean,
|
||||
logger: Logger,
|
||||
private val zipAccessor: ZipFileSystemAccessor?
|
||||
private val zipAccessor: ZipFileSystemAccessor?,
|
||||
knownIrProviders: List<String>,
|
||||
) : KotlinLibraryProperResolverWithAttributes<KotlinLibrary>(
|
||||
repositories,
|
||||
directLibs,
|
||||
@@ -87,7 +92,7 @@ private class KLibResolverHelper(
|
||||
localKotlinDir,
|
||||
skipCurrentDir,
|
||||
logger,
|
||||
emptyList()
|
||||
knownIrProviders,
|
||||
) {
|
||||
// Stick with the default KotlinLibrary for now.
|
||||
override fun libraryComponentBuilder(file: File, isDefault: Boolean) = createKotlinLibraryComponents(file, isDefault, zipAccessor)
|
||||
|
||||
Reference in New Issue
Block a user