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

[Gradle, JS] Fix check on klib

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-22 14:43:59 +03:00
parent 72cb0de705
commit 79fa3c2c30
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt
+7 -3
View File
@@ -67,8 +67,7 @@ object LibraryUtils {
return checkAttributeValue(library, TITLE_KOTLIN_JAVASCRIPT_STDLIB, Attributes.Name.IMPLEMENTATION_TITLE) return checkAttributeValue(library, TITLE_KOTLIN_JAVASCRIPT_STDLIB, Attributes.Name.IMPLEMENTATION_TITLE)
} }
private fun isZippedKlib(candidate: File): Boolean { private fun isZippedKlibInZip(candidate: File): Boolean {
if (candidate.extension == "klib") return true
var manifestFound = false var manifestFound = false
var irFound = false var irFound = false
for (entry in ZipFile(candidate).entries()) { for (entry in ZipFile(candidate).entries()) {
@@ -78,10 +77,15 @@ object LibraryUtils {
return manifestFound && irFound return manifestFound && irFound
} }
private fun isZippedKlib(candidate: File): Boolean {
return candidate.extension == "klib"
}
@JvmStatic @JvmStatic
fun isKotlinJavascriptIrLibrary(candidate: File): Boolean { fun isKotlinJavascriptIrLibrary(candidate: File): Boolean {
return when { return when {
FileUtil.isJarOrZip(candidate) -> isZippedKlib(candidate) isZippedKlib(candidate) -> true
FileUtil.isJarOrZip(candidate) -> isZippedKlibInZip(candidate)
!File(candidate, "manifest").isFile -> false !File(candidate, "manifest").isFile -> false
!File(candidate, "ir").isDirectory -> false !File(candidate, "ir").isDirectory -> false
else -> true else -> true