From 2d026e7973cd377e4903a56bd5f62e90f007a832 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 21 Oct 2019 18:56:09 +0300 Subject: [PATCH] [Gradle, JS] Make disambiguate take vararg --- .../gradle/targets/js/subtargets/KotlinBrowserJs.kt | 13 +++++-------- .../targets/js/subtargets/KotlinJsSubTarget.kt | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index 6544d3564f7..1bcf1f58fdb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -79,10 +79,8 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : val kind = buildVariant.kind val runTask = project.registerTask( disambiguateCamelCased( - lowerCamelCaseName( - buildVariant.name, - "run" - ) + buildVariant.name, + "run" ) ) { val compileKotlinTask = compilation.compileKotlinTask @@ -135,10 +133,9 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : val kind = buildVariant.kind val webpackTask = project.registerTask( disambiguateCamelCased( - lowerCamelCaseName( - buildVariant.name, - "webpack" - ) + buildVariant.name, + "webpack" + ) ) { val compileKotlinTask = compilation.compileKotlinTask diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt index 88bfc9492d7..8c18b1af8a7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt @@ -54,8 +54,8 @@ abstract class KotlinJsSubTarget( testRuns.getByName(KotlinTargetWithTests.DEFAULT_TEST_RUN_NAME).executionTask.configure(body) } - protected fun disambiguateCamelCased(name: String): String = - lowerCamelCaseName(target.disambiguationClassifier, disambiguationClassifier, name) + protected fun disambiguateCamelCased(vararg names: String): String = + lowerCamelCaseName(target.disambiguationClassifier, disambiguationClassifier, *names) abstract fun configureBuildVariants()