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

[Gradle, JS] Fix name of publication in both mode

Browse Source
This commit is contained in:
Ilya Goncharov
2020-06-04 16:55:12 +03:00
parent 60d62148e8
commit 18914ac9a5
1 changed files with 4 additions and 3 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/KotlinJsTarget.kt
+4 -3
View File
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator.Companion.runTaskNameSuffix import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator.Companion.runTaskNameSuffix
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.LEGACY
import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.*
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBrowserDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBrowserDsl
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsNodeDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsNodeDsl
@@ -55,7 +56,7 @@ constructor(
val disambiguationClassifierInPlatform: String? val disambiguationClassifierInPlatform: String?
get() = if (irTarget != null) { get() = if (irTarget != null) {
disambiguationClassifier?.removeJsCompilerSuffix(KotlinJsCompilerType.LEGACY) disambiguationClassifier?.removeJsCompilerSuffix(LEGACY)
} else { } else {
disambiguationClassifier disambiguationClassifier
} }
@@ -70,7 +71,7 @@ constructor(
val componentName = val componentName =
if (project.kotlinExtension is KotlinMultiplatformExtension) if (project.kotlinExtension is KotlinMultiplatformExtension)
targetName irTarget?.let { targetName.removeJsCompilerSuffix(LEGACY) } ?: targetName
else PRIMARY_SINGLE_COMPONENT_NAME else PRIMARY_SINGLE_COMPONENT_NAME
val result = createKotlinVariant(componentName, mainCompilation, usageContexts) val result = createKotlinVariant(componentName, mainCompilation, usageContexts)
@@ -104,7 +105,7 @@ constructor(
): KotlinVariant { ): KotlinVariant {
return super.createKotlinVariant(componentName, compilation, usageContexts).apply { return super.createKotlinVariant(componentName, compilation, usageContexts).apply {
irTarget?.let { irTarget?.let {
artifactTargetName = targetName.removeJsCompilerSuffix(KotlinJsCompilerType.LEGACY) artifactTargetName = targetName.removeJsCompilerSuffix(LEGACY)
} }
} }
} }