[MPP] Improve displayed names for cinterop dependencies in import
KT-54974
This commit is contained in:
committed by
Space Team
parent
1c79e5a71a
commit
424d1e23fc
+14
-2
@@ -32,12 +32,14 @@ private fun createCinteropLibraryDependency(project: Project, libraryFile: java.
|
||||
return null
|
||||
}
|
||||
|
||||
val (group, module) = cinteropGroupAndModule(library)
|
||||
|
||||
return IdeaKotlinResolvedBinaryDependency(
|
||||
binaryType = IdeaKotlinBinaryDependency.KOTLIN_COMPILE_BINARY_TYPE,
|
||||
classpath = IdeaKotlinClasspath(libraryFile),
|
||||
coordinates = IdeaKotlinBinaryCoordinates(
|
||||
group = project.group.toString(),
|
||||
module = library.moduleDisplayName,
|
||||
group = group,
|
||||
module = module,
|
||||
version = null, // TODO (kirpichenkov): if/when used for published cinterops, should be set up correctly
|
||||
sourceSetName = library.nativeTargets.singleOrNull() ?: library.nativeTargets.joinToString(prefix = "(", postfix = ")")
|
||||
),
|
||||
@@ -45,3 +47,13 @@ private fun createCinteropLibraryDependency(project: Project, libraryFile: java.
|
||||
klibExtra = KlibExtra(library)
|
||||
}
|
||||
}
|
||||
|
||||
private fun cinteropGroupAndModule(library: KotlinLibrary): Pair<String, String> {
|
||||
val nameParts = library.uniqueName.split(":")
|
||||
|
||||
return when (nameParts.size) {
|
||||
0 -> "<unknown>" to "<unknown>"
|
||||
1 -> "<unknown>" to nameParts.single()
|
||||
else -> nameParts[0] to nameParts[1]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user