[Gradle, JS] Make disambiguate take vararg
This commit is contained in:
+5
-8
@@ -79,10 +79,8 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
|
||||
val kind = buildVariant.kind
|
||||
val runTask = project.registerTask<KotlinWebpack>(
|
||||
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<KotlinWebpack>(
|
||||
disambiguateCamelCased(
|
||||
lowerCamelCaseName(
|
||||
buildVariant.name,
|
||||
"webpack"
|
||||
)
|
||||
buildVariant.name,
|
||||
"webpack"
|
||||
|
||||
)
|
||||
) {
|
||||
val compileKotlinTask = compilation.compileKotlinTask
|
||||
|
||||
+2
-2
@@ -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()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user