[Gradle, JS] Remove redundant baseName

This commit is contained in:
Ilya Goncharov
2020-02-13 12:40:49 +03:00
parent d00c53fd38
commit 625e94822f
@@ -38,21 +38,30 @@ constructor(
fun executable( fun executable(
compilation: KotlinJsCompilation = defaultCompilation compilation: KotlinJsCompilation = defaultCompilation
) = createBinaries( ) = createBinaries(
baseName = project.name,
compilation = compilation, compilation = compilation,
jsBinaryType = JsBinaryType.EXECUTABLE, jsBinaryType = JsBinaryType.EXECUTABLE,
create = ::Executable create = ::Executable
) )
internal fun testExecutable() = createBinaries( internal fun testExecutable() = createBinaries(
baseName = project.name,
compilation = defaultTestCompilation, compilation = defaultTestCompilation,
jsBinaryType = JsBinaryType.TEST, jsBinaryType = JsBinaryType.TEST,
create = ::TestExecutable create = ::TestExecutable
) )
internal fun getBinary(
buildVariantKind: BuildVariantKind,
jsBinaryType: JsBinaryType
): JsBinary =
nameToBinary.getValue(
generateBinaryName(
buildVariantKind,
jsBinaryType
)
)
private fun <T : JsBinary> createBinaries( private fun <T : JsBinary> createBinaries(
baseName: String,
compilation: KotlinJsCompilation, compilation: KotlinJsCompilation,
buildVariantKinds: Collection<BuildVariantKind> = listOf(PRODUCTION, DEVELOPMENT), buildVariantKinds: Collection<BuildVariantKind> = listOf(PRODUCTION, DEVELOPMENT),
jsBinaryType: JsBinaryType, jsBinaryType: JsBinaryType,
@@ -60,7 +69,6 @@ constructor(
) { ) {
buildVariantKinds.forEach { buildVariantKind -> buildVariantKinds.forEach { buildVariantKind ->
val name = generateBinaryName( val name = generateBinaryName(
baseName,
buildVariantKind, buildVariantKind,
jsBinaryType jsBinaryType
) )
@@ -81,12 +89,10 @@ constructor(
companion object { companion object {
internal fun generateBinaryName( internal fun generateBinaryName(
name: String,
buildVariantKind: BuildVariantKind, buildVariantKind: BuildVariantKind,
jsBinaryType: JsBinaryType jsBinaryType: JsBinaryType
) = ) =
lowerCamelCaseName( lowerCamelCaseName(
name,
buildVariantKind.name, buildVariantKind.name,
jsBinaryType.name jsBinaryType.name
) )