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

[Commonizer] NativeLibraryLoader: Improve error message when loading a library fails

Browse Source
This commit is contained in:
sebastian.sellmair
2021-04-01 10:04:42 +02:00
parent 250915f377
commit 88a913c7dc
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/commonizer/NativeLibraryLoader.kt
+20 -13
View File
@@ -21,24 +21,31 @@ internal class DefaultNativeLibraryLoader(
private val logger: Logger private val logger: Logger
) : NativeLibraryLoader { ) : NativeLibraryLoader {
override fun invoke(file: File): NativeLibrary { override fun invoke(file: File): NativeLibrary {
val library = resolveSingleFileKlib( try {
libraryFile = org.jetbrains.kotlin.konan.file.File(file.path), val library = resolveSingleFileKlib(
logger = logger, libraryFile = org.jetbrains.kotlin.konan.file.File(file.path),
strategy = ToolingSingleFileKlibResolveStrategy logger = logger,
) strategy = ToolingSingleFileKlibResolveStrategy
)
if (library.versions.metadataVersion == null) if (library.versions.metadataVersion == null)
logger.fatal("Library does not have metadata version specified in manifest: $file") logger.fatal("Library does not have metadata version specified in manifest: $file")
val metadataVersion = library.metadataVersion val metadataVersion = library.metadataVersion
if (metadataVersion?.isCompatible() != true) if (metadataVersion?.isCompatible() != true)
logger.fatal( logger.fatal(
""" """
Library has incompatible metadata version ${metadataVersion ?: "\"unknown\""}: $file Library has incompatible metadata version ${metadataVersion ?: "\"unknown\""}: $file
Please make sure that all libraries passed to commonizer compatible metadata version ${KlibMetadataVersion.INSTANCE} Please make sure that all libraries passed to commonizer compatible metadata version ${KlibMetadataVersion.INSTANCE}
""".trimIndent() """.trimIndent()
)
return NativeLibrary(library)
} catch (cause: Throwable) {
throw NativeLibraryLoadingException(
"Failed loading library at ${file.path}", cause
) )
}
return NativeLibrary(library)
} }
} }
internal class NativeLibraryLoadingException(message: String, cause: Throwable? = null) : Exception(message, cause)