@@ -55,8 +55,8 @@ import org.jetbrains.kotlin.js.config.JSConfigurationKeys
5555import org.jetbrains.kotlin.js.resolve.JsPlatformAnalyzerServices
5656import org.jetbrains.kotlin.library.KLIB_FILE_EXTENSION
5757import org.jetbrains.kotlin.library.KotlinLibrary
58- import org.jetbrains.kotlin.library.SingleFileKlibResolveStrategy
59- import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy
58+ import org.jetbrains.kotlin.library.loader.KlibLoader
59+ import org.jetbrains.kotlin.library.loader.reportLoadingProblemsIfAny
6060import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
6161import org.jetbrains.kotlin.load.java.structure.impl.classFiles.BinaryJavaClass
6262import org.jetbrains.kotlin.name.Name
@@ -76,6 +76,7 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformAnalyzerServices
7676import org.jetbrains.kotlin.resolve.konan.platform.NativePlatformAnalyzerServices
7777import org.jetbrains.kotlin.storage.LockBasedStorageManager
7878import org.jetbrains.kotlin.util.DummyLogger
79+ import org.jetbrains.kotlin.util.Logger
7980import java.io.File
8081import org.jetbrains.kotlin.konan.file.File as KFile
8182
@@ -305,8 +306,7 @@ public class AnalysisEnvironment(
305306 .filter { it.isDirectory || it.extension == KLIB_FILE_EXTENSION }
306307 .forEach { libraryFile ->
307308 try {
308- val kotlinLibrary = ToolingSingleFileKlibResolveStrategy
309- .resolve(KFile (libraryFile.absolutePath), DummyLogger )
309+ val kotlinLibrary = resolveSingleFileKlib(KFile (libraryFile.absolutePath), DummyLogger )
310310 if (kLibService.isAnalysisCompatible(kotlinLibrary)) {
311311 // exists, is KLIB, has compatible format
312312 result.put(
@@ -588,3 +588,11 @@ public class AnalysisEnvironment(
588588 }
589589
590590}
591+
592+ private fun resolveSingleFileKlib (libraryFile : KFile , logger : Logger ): KotlinLibrary {
593+ val klibLoadingResult = KlibLoader { libraryPaths(libraryFile.path) }.load()
594+ klibLoadingResult.reportLoadingProblemsIfAny { _, message ->
595+ logger.error(message)
596+ }
597+ return klibLoadingResult.librariesStdlibFirst.single()
598+ }
0 commit comments