From a431e20b45db597c45be97e2c00a5ea4de8363dd Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Tue, 26 May 2020 00:07:53 +0300 Subject: [PATCH] Fix import of js MPP source sets in both mode #KT-38706 Fixed --- .../kotlin/gradle/targets/js/KotlinJsTargetPreset.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt index f2656c01fcf..434e9075bef 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt @@ -31,6 +31,8 @@ open class KotlinJsTargetPreset( override val platformType: KotlinPlatformType get() = KotlinPlatformType.js + override fun useDisambiguitionClassifierAsSourcesetNamePreffix() = false + override fun instantiateTarget(name: String): KotlinJsTarget { return project.objects.newInstance( KotlinJsTarget::class.java, @@ -95,8 +97,6 @@ class KotlinJsSingleTargetPreset( override val isMpp: Boolean get() = false - override fun useDisambiguitionClassifierAsSourcesetNamePreffix() = false - // In a Kotlin/JS single-platform project, we don't need any disambiguation suffixes or prefixes in the names: override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget): String? = irPreset?.let {