From 07d80aa11c62eab28846b3b43b6de61010bc3ab1 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 1 Apr 2020 15:34:28 +0300 Subject: [PATCH] [Gradle, JS] KT-36784 Enable composite builds only for IR compiler #KT-32466 fixed #KT-36784 fixed #KT-36864 fixed --- .../js/npm/resolver/KotlinCompilationNpmResolver.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt index 269eb116127..c5d8c74de44 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages import org.jetbrains.kotlin.gradle.plugin.mpp.disambiguateName import org.jetbrains.kotlin.gradle.plugin.usesPlatformOf +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget import org.jetbrains.kotlin.gradle.targets.js.npm.* import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency.Scope.* import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject.Companion.PACKAGE_JSON @@ -215,6 +216,16 @@ internal class KotlinCompilationNpmResolver( dependency: ResolvedDependency, componentIdentifier: ProjectComponentIdentifier ) { + check(target is KotlinJsIrTarget) { + """ + Composite builds for Kotlin/JS are supported only for IR compiler. + Use kotlin.js.compiler=ir in gradle.properties or + js(IR) { + ... + } + """.trimIndent() + } + (componentIdentifier as DefaultProjectComponentIdentifier).let { identifier -> val includedBuild = project.gradle.includedBuild(identifier.identityPath.topRealPath().name!!) internalCompositeDependencies.add(CompositeDependency(dependency, includedBuild))