From 246fb3178699d7d70e6a48f8f617476aceb38cf7 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 23 Jan 2020 14:16:01 +0300 Subject: [PATCH] [Gradle, JS] Add hack for process ir compilations in NPM resolver in mixed --- .../js/npm/resolver/KotlinProjectNpmResolver.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt index 80c3ee32961..a93576246ca 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtensionOrNull import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation +import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinProjectNpmResolution @@ -66,6 +67,15 @@ internal class KotlinProjectNpmResolver( addCompilation(compilation) } } + + // Hack for mixed mode, when target is JS and contain JS-IR + if (target is KotlinJsTarget) { + target.irTarget?.compilations?.all { compilation -> + if (compilation is KotlinJsCompilation) { + addCompilation(compilation) + } + } + } } }