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

[Gradle, JS] Disambiguation classifier consider single platform plugin

Browse Source
This commit is contained in:
Ilya Goncharov
2020-02-18 13:36:52 +03:00
parent 4189bc88c2
commit ecb89ad259
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/JsCompilerType.kt
+8 -2
View File
@@ -30,5 +30,11 @@ enum class JsCompilerType : Named, Serializable {
}
}
fun String.removeCapitalizedJsCompilerSuffix(compilerType: JsCompilerType): String =
removeSuffix(compilerType.name.capitalize())
fun String.removeJsCompilerSuffix(compilerType: JsCompilerType): String {
val truncatedString = removeSuffix(compilerType.name)
if (this != truncatedString) {
return truncatedString
}
return removeSuffix(compilerType.name.capitalize())
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt
+3 -2
View File
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions
import org.jetbrains.kotlin.gradle.plugin.JsCompilerType
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationWithResources
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.removeCapitalizedJsCompilerSuffix
import org.jetbrains.kotlin.gradle.plugin.removeJsCompilerSuffix
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
@@ -38,7 +38,8 @@ open class KotlinJsCompilation(
override val defaultSourceSetName: String
get() = lowerCamelCaseName(
(target as KotlinJsTarget).irTarget?.let {
target.disambiguationClassifier?.removeCapitalizedJsCompilerSuffix(JsCompilerType.legacy)
target.disambiguationClassifier
?.removeJsCompilerSuffix(JsCompilerType.legacy)
} ?: target.disambiguationClassifier,
compilationName
)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt
+1 -1
View File
@@ -70,7 +70,7 @@ constructor(
): KotlinVariant {
return super.createKotlinVariant(componentName, compilation, usageContexts).apply {
irTarget?.let {
artifactTargetName = targetName.removeCapitalizedJsCompilerSuffix(JsCompilerType.legacy)
artifactTargetName = targetName.removeJsCompilerSuffix(JsCompilerType.legacy)
}
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt
+3 -3
View File
@@ -11,7 +11,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.plugin.JsCompilerType
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.removeCapitalizedJsCompilerSuffix
import org.jetbrains.kotlin.gradle.plugin.removeJsCompilerSuffix
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTargetConfigurator
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset
@@ -37,7 +37,7 @@ open class KotlinJsTargetPreset(
platformType
).apply {
this.irTarget = irPreset?.createTarget(
lowerCamelCaseName(name.removeCapitalizedJsCompilerSuffix(JsCompilerType.legacy), JsCompilerType.ir.name)
lowerCamelCaseName(name.removeJsCompilerSuffix(JsCompilerType.legacy), JsCompilerType.ir.name)
)
}
}
@@ -73,7 +73,7 @@ class KotlinJsSingleTargetPreset(
override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget<KotlinJsCompilation>): String? =
irPreset?.let {
super.provideTargetDisambiguationClassifier(target)
?.removePrefix(target.name.removeCapitalizedJsCompilerSuffix(JsCompilerType.legacy))
?.removePrefix(target.name.removeJsCompilerSuffix(JsCompilerType.legacy))
?.decapitalize()
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt
+1 -1
View File
@@ -48,7 +48,7 @@ class KotlinJsIrCompilation(
return lowerCamelCaseName(
if ((target as KotlinJsIrTarget).mixedMode)
target.disambiguationClassifier
?.removeCapitalizedJsCompilerSuffix(JsCompilerType.ir)
?.removeJsCompilerSuffix(JsCompilerType.ir)
else
target.disambiguationClassifier,
compilationName
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt
+2 -2
View File
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCompilationFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTargetPreset
import org.jetbrains.kotlin.gradle.plugin.removeCapitalizedJsCompilerSuffix
import org.jetbrains.kotlin.gradle.plugin.removeJsCompilerSuffix
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
open class KotlinJsIrTargetPreset(
@@ -61,7 +61,7 @@ class KotlinJsIrSingleTargetPreset(
override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget<KotlinJsIrCompilation>): String? {
return if (mixedMode!!) {
super.provideTargetDisambiguationClassifier(target)
?.removePrefix(target.name.removeCapitalizedJsCompilerSuffix(JsCompilerType.ir))
?.removePrefix(target.name.removeJsCompilerSuffix(JsCompilerType.ir))
?.decapitalize()
} else {
null