Skip to content

Commit c921322

Browse files
ddolovovSpace Team
authored andcommitted
Klib Loading: Use KlibLoader instead of legacy API in Analysis API
^KT-61096
1 parent e462564 commit c921322

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/converters/AnalysisApiBasedDtsGeneratorFacade.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package org.jetbrains.kotlin.js.test.converters
77

8+
import org.jetbrains.kotlin.backend.common.reportLoadingProblemsIfAny
89
import org.jetbrains.kotlin.config.moduleName
910
import org.jetbrains.kotlin.ir.backend.js.jsOutputName
1011
import org.jetbrains.kotlin.js.config.*
1112
import org.jetbrains.kotlin.js.tsexport.TypeScriptExportConfig
1213
import org.jetbrains.kotlin.js.tsexport.TypeScriptModuleConfig
1314
import org.jetbrains.kotlin.js.tsexport.runTypeScriptExport
14-
import org.jetbrains.kotlin.library.impl.KLIB_DEFAULT_COMPONENT_NAME
15-
import org.jetbrains.kotlin.library.impl.createKotlinLibrary
15+
import org.jetbrains.kotlin.library.loader.KlibLoader
1616
import org.jetbrains.kotlin.library.metadata.KlibInputModule
1717
import org.jetbrains.kotlin.library.uniqueName
1818
import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.test.services.*
2121
import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator
2222
import java.io.File
2323
import kotlin.io.path.Path
24-
import org.jetbrains.kotlin.konan.file.File as KonanFile
2524

2625
class AnalysisApiBasedDtsGeneratorFacade(
2726
private val testServices: TestServices,
@@ -74,7 +73,9 @@ class AnalysisApiBasedDtsGeneratorFacade(
7473
}
7574

7675
private fun createInputModule(libraryPath: String): KlibInputModule<TypeScriptModuleConfig> {
77-
val library = createKotlinLibrary(KonanFile(libraryPath), KLIB_DEFAULT_COMPONENT_NAME)
76+
val result = KlibLoader { libraryPaths(libraryPath) }.load()
77+
result.reportLoadingProblemsIfAny { _, message -> testServices.assertions.fail { message } }
78+
val library = result.librariesStdlibFirst[0]
7879
return KlibInputModule(library.uniqueName, Path(libraryPath), TypeScriptModuleConfig(outputName = library.jsOutputName))
7980
}
8081

0 commit comments

Comments
 (0)