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

Fix import of js MPP source sets in both mode

Browse Source 
#KT-38706 Fixed
This commit is contained in:
Andrey Uskov
2020-05-26 00:07:53 +03:00
parent 36c9d04cd3
commit a431e20b45
1 changed files with 2 additions and 2 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/KotlinJsTargetPreset.kt
+2 -2
View File
@@ -31,6 +31,8 @@ open class KotlinJsTargetPreset(
override val platformType: KotlinPlatformType override val platformType: KotlinPlatformType
get() = KotlinPlatformType.js get() = KotlinPlatformType.js
override fun useDisambiguitionClassifierAsSourcesetNamePreffix() = false
override fun instantiateTarget(name: String): KotlinJsTarget { override fun instantiateTarget(name: String): KotlinJsTarget {
return project.objects.newInstance( return project.objects.newInstance(
KotlinJsTarget::class.java, KotlinJsTarget::class.java,
@@ -95,8 +97,6 @@ class KotlinJsSingleTargetPreset(
override val isMpp: Boolean override val isMpp: Boolean
get() = false 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: // In a Kotlin/JS single-platform project, we don't need any disambiguation suffixes or prefixes in the names:
override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget<KotlinJsCompilation>): String? = override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget<KotlinJsCompilation>): String? =
irPreset?.let { irPreset?.let {