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

[Gradle, JS] Use formal check of klibs in gradle plugin

Browse Source
This commit is contained in:
Ilya Goncharov
2021-11-02 15:50:14 +03:00
committed by Space
parent 18ff64a28f
commit 3ef5e36425
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.config/src/org/jetbrains/kotlin/utils/JsLibraryUtils.kt
+3 -2
View File
@@ -32,8 +32,9 @@ object JsLibraryUtils {
return when { return when {
isZippedKlib(candidate) -> true isZippedKlib(candidate) -> true
FileUtil.isJarOrZip(candidate) -> isZippedKlibInZip(candidate) FileUtil.isJarOrZip(candidate) -> isZippedKlibInZip(candidate)
!File(candidate, "manifest").isFile -> false !candidate.resolve("default").isDirectory -> false
!File(candidate, "ir").isDirectory -> false !candidate.resolve("default").resolve("manifest").isFile -> false
!candidate.resolve("default").resolve("ir").isDirectory -> false
else -> true else -> true
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+2 -3
View File
@@ -56,7 +56,6 @@ import org.jetbrains.kotlin.gradle.utils.*
import org.jetbrains.kotlin.incremental.ChangedFiles import org.jetbrains.kotlin.incremental.ChangedFiles
import org.jetbrains.kotlin.incremental.ClasspathChanges import org.jetbrains.kotlin.incremental.ClasspathChanges
import org.jetbrains.kotlin.incremental.IncrementalCompilerRunner import org.jetbrains.kotlin.incremental.IncrementalCompilerRunner
import org.jetbrains.kotlin.library.impl.isKotlinLibrary
import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics
import org.jetbrains.kotlin.utils.JsLibraryUtils import org.jetbrains.kotlin.utils.JsLibraryUtils
import org.jetbrains.kotlin.utils.addToStdlib.cast import org.jetbrains.kotlin.utils.addToStdlib.cast
@@ -1047,7 +1046,7 @@ abstract class Kotlin2JsCompile @Inject constructor(
get() = (kotlinOptions as KotlinJsOptionsImpl).sourceMapBaseDirs get() = (kotlinOptions as KotlinJsOptionsImpl).sourceMapBaseDirs
private fun isHybridKotlinJsLibrary(file: File): Boolean = private fun isHybridKotlinJsLibrary(file: File): Boolean =
JsLibraryUtils.isKotlinJavascriptLibrary(file) && isKotlinLibrary(file) JsLibraryUtils.isKotlinJavascriptLibrary(file) && JsLibraryUtils.isKotlinJavascriptIrLibrary(file)
private fun KotlinJsOptions.isPreIrBackendDisabled(): Boolean = private fun KotlinJsOptions.isPreIrBackendDisabled(): Boolean =
listOf( listOf(
@@ -1080,7 +1079,7 @@ abstract class Kotlin2JsCompile @Inject constructor(
if (kotlinOptions.isPreIrBackendDisabled()) { if (kotlinOptions.isPreIrBackendDisabled()) {
//::isKotlinLibrary //::isKotlinLibrary
// Workaround for KT-47797 // Workaround for KT-47797
{ isKotlinLibrary(it) } { JsLibraryUtils.isKotlinJavascriptIrLibrary(it) }
} else { } else {
::isHybridKotlinJsLibrary ::isHybridKotlinJsLibrary
} }