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

[Gradle, JS] Fix for IDEA import with dukat binaries

Browse Source 
^KT-42954 fixed
This commit is contained in:
Ilya Goncharov
2020-10-27 12:10:49 +03:00
parent bb2e9e2d56
commit e6edb62911
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt
+4 -2
View File
@@ -89,7 +89,9 @@ internal class DukatCompilationResolverPlugin(
val target = compilation.target val target = compilation.target
val externalsOutputFormat = compilation.externalsOutputFormat val externalsOutputFormat = compilation.externalsOutputFormat
if (target is KotlinJsTarget && externalsOutputFormat == ExternalsOutputFormat.SOURCE) { val legacyTargetReuseIrTask =
target is KotlinJsTarget && (target.irTarget != null && externalsOutputFormat == ExternalsOutputFormat.SOURCE)
if (legacyTargetReuseIrTask) {
return return
} }
@@ -105,7 +107,7 @@ internal class DukatCompilationResolverPlugin(
} }
companion object { companion object {
const val VERSION = "2" const val VERSION = "3"
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt
+1 -1
View File
@@ -40,7 +40,7 @@ class DukatExecutor(
versionFile.delete() versionFile.delete()
npmProject.externalsDirRoot.mkdirs() npmProject.externalsDirRoot.mkdirs()
val inputs = typeDefinitions.joinToString("\n") { it.inputKey } val inputs = "$externalsOutputFormat: " + typeDefinitions.joinToString("\n") { it.inputKey }
if (!compareInputs || !inputsFile.isFile || inputsFile.readText() != inputs) { if (!compareInputs || !inputsFile.isFile || inputsFile.readText() != inputs) {
// delete file to run visit on error even without package.json updates // delete file to run visit on error even without package.json updates