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

[Gradle, JS] Fix lower case of target

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-30 14:38:29 +03:00
parent d50f520639
commit 57d2939cf9
2 changed files with 3 additions and 6 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/KotlinJsCompilation.kt
+1 -1
View File
@@ -34,7 +34,7 @@ open class KotlinJsCompilation(
override val defaultSourceSetName: String override val defaultSourceSetName: String
get() = lowerCamelCaseName( get() = lowerCamelCaseName(
target.disambiguationClassifier?.removePrefix(LEGACY_DISAMBIGUATION_CLASSIFIER)?.toLowerCase(), target.disambiguationClassifier?.removePrefix(LEGACY_DISAMBIGUATION_CLASSIFIER),
compilationName compilationName
) )
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt
+2 -5
View File
@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTargetConfigurator
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrSingleTargetPreset import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrSingleTargetPreset
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetConfigurator import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetConfigurator
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
open class KotlinJsTargetPreset( open class KotlinJsTargetPreset(
project: Project, project: Project,
@@ -45,10 +44,8 @@ open class KotlinJsTargetPreset(
if (irPreset == null) { if (irPreset == null) {
super.provideTargetDisambiguationClassifier(target) super.provideTargetDisambiguationClassifier(target)
} else { } else {
lowerCamelCaseName( LEGACY_DISAMBIGUATION_CLASSIFIER +
LEGACY_DISAMBIGUATION_CLASSIFIER, super.provideTargetDisambiguationClassifier(target)
super.provideTargetDisambiguationClassifier(target)
)
} }
override fun createKotlinTargetConfigurator() = KotlinJsTargetConfigurator( override fun createKotlinTargetConfigurator() = KotlinJsTargetConfigurator(