KLIB: Clean-up AbstractKlibLibraryInfo API
This commit is contained in:
+3
-1
@@ -78,7 +78,9 @@ class CommonPlatformKindResolution : IdePlatformKindResolution {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class CommonKlibLibraryInfo(project: Project, library: Library, libraryRoot: String) : AbstractKlibLibraryInfo(project, library, libraryRoot) {
|
class CommonKlibLibraryInfo(project: Project, library: Library, libraryRoot: String) :
|
||||||
|
AbstractKlibLibraryInfo(project, library, libraryRoot) {
|
||||||
|
|
||||||
override val platform: TargetPlatform
|
override val platform: TargetPlatform
|
||||||
get() = CommonPlatforms.defaultCommonPlatform
|
get() = CommonPlatforms.defaultCommonPlatform
|
||||||
}
|
}
|
||||||
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.idea.util.IJLoggerAdapter
|
|||||||
import org.jetbrains.kotlin.konan.file.File
|
import org.jetbrains.kotlin.konan.file.File
|
||||||
import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy
|
import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy
|
||||||
import org.jetbrains.kotlin.library.resolveSingleFileKlib
|
import org.jetbrains.kotlin.library.resolveSingleFileKlib
|
||||||
|
import org.jetbrains.kotlin.platform.TargetPlatform
|
||||||
|
|
||||||
abstract class AbstractKlibLibraryInfo(project: Project, library: Library, val libraryRoot: String) : LibraryInfo(project, library) {
|
abstract class AbstractKlibLibraryInfo(project: Project, library: Library, val libraryRoot: String) : LibraryInfo(project, library) {
|
||||||
|
|
||||||
@@ -23,7 +24,11 @@ abstract class AbstractKlibLibraryInfo(project: Project, library: Library, val l
|
|||||||
|
|
||||||
val compatibilityInfo by lazy { resolvedKotlinLibrary.getCompatibilityInfo() }
|
val compatibilityInfo by lazy { resolvedKotlinLibrary.getCompatibilityInfo() }
|
||||||
|
|
||||||
override fun getLibraryRoots() = listOf(libraryRoot)
|
final override fun getLibraryRoots() = listOf(libraryRoot)
|
||||||
|
|
||||||
|
final override fun toString() = "${this::class.simpleName}(libraryName=${library.name}, libraryRoot=$libraryRoot)"
|
||||||
|
|
||||||
|
abstract override val platform: TargetPlatform // must override
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val LOG = IJLoggerAdapter.getInstance(AbstractKlibLibraryInfo::class.java)
|
private val LOG = IJLoggerAdapter.getInstance(AbstractKlibLibraryInfo::class.java)
|
||||||
|
|||||||
@@ -169,6 +169,4 @@ class NativeKlibLibraryInfo(project: Project, library: Library, libraryRoot: Str
|
|||||||
|
|
||||||
override val platform: TargetPlatform
|
override val platform: TargetPlatform
|
||||||
get() = KonanPlatforms.defaultKonanPlatform
|
get() = KonanPlatforms.defaultKonanPlatform
|
||||||
|
|
||||||
override fun toString() = "Native" + super.toString()
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user