From e6edb62911930201ac0d40d9959c0986c51363f3 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 27 Oct 2020 12:10:49 +0300 Subject: [PATCH] [Gradle, JS] Fix for IDEA import with dukat binaries ^KT-42954 fixed --- .../targets/js/dukat/DukatCompilationResolverPlugin.kt | 6 ++++-- .../kotlin/gradle/targets/js/dukat/DukatExecutor.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt index c4fc3f51bc5..00c8e6f723f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt @@ -89,7 +89,9 @@ internal class DukatCompilationResolverPlugin( val target = compilation.target 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 } @@ -105,7 +107,7 @@ internal class DukatCompilationResolverPlugin( } companion object { - const val VERSION = "2" + const val VERSION = "3" } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt index 32ac555e611..0984b51efd4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt @@ -40,7 +40,7 @@ class DukatExecutor( versionFile.delete() 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) { // delete file to run visit on error even without package.json updates