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

[Gradle, JS] JsBinaryType to KotlinJsBinaryType

Browse Source
This commit is contained in:
Ilya Goncharov
2020-06-01 13:25:27 +03:00
parent d27ad99daa
commit d3260bca27
2 changed files with 6 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/ir/KotlinJsBinaryContainer.kt
+5 -5
View File
@@ -69,13 +69,13 @@ constructor(
internal fun executableIrInternal(compilation: KotlinJsCompilation) = createBinaries( internal fun executableIrInternal(compilation: KotlinJsCompilation) = createBinaries(
compilation = compilation, compilation = compilation,
jsBinaryType = JsBinaryType.EXECUTABLE, jsBinaryType = KotlinJsBinaryType.EXECUTABLE,
create = ::Executable create = ::Executable
) )
private fun executableLegacyInternal(compilation: KotlinJsCompilation) = createBinaries( private fun executableLegacyInternal(compilation: KotlinJsCompilation) = createBinaries(
compilation = compilation, compilation = compilation,
jsBinaryType = JsBinaryType.EXECUTABLE, jsBinaryType = KotlinJsBinaryType.EXECUTABLE,
create = { compilation, name, type -> create = { compilation, name, type ->
object : JsBinary { object : JsBinary {
override val compilation: KotlinJsCompilation = compilation override val compilation: KotlinJsCompilation = compilation
@@ -94,7 +94,7 @@ constructor(
private fun <T : JsBinary> createBinaries( private fun <T : JsBinary> createBinaries(
compilation: KotlinJsCompilation, compilation: KotlinJsCompilation,
modes: Collection<KotlinJsBinaryMode> = listOf(PRODUCTION, DEVELOPMENT), modes: Collection<KotlinJsBinaryMode> = listOf(PRODUCTION, DEVELOPMENT),
jsBinaryType: JsBinaryType, jsBinaryType: KotlinJsBinaryType,
create: (compilation: KotlinJsCompilation, name: String, mode: KotlinJsBinaryMode) -> T create: (compilation: KotlinJsCompilation, name: String, mode: KotlinJsBinaryMode) -> T
) { ) {
modes.forEach { modes.forEach {
@@ -110,7 +110,7 @@ constructor(
private fun <T : JsBinary> createBinary( private fun <T : JsBinary> createBinary(
compilation: KotlinJsCompilation, compilation: KotlinJsCompilation,
mode: KotlinJsBinaryMode, mode: KotlinJsBinaryMode,
jsBinaryType: JsBinaryType, jsBinaryType: KotlinJsBinaryType,
create: (compilation: KotlinJsCompilation, name: String, mode: KotlinJsBinaryMode) -> T create: (compilation: KotlinJsCompilation, name: String, mode: KotlinJsBinaryMode) -> T
) { ) {
val name = generateBinaryName( val name = generateBinaryName(
@@ -137,7 +137,7 @@ constructor(
internal fun generateBinaryName( internal fun generateBinaryName(
compilation: KotlinJsCompilation, compilation: KotlinJsCompilation,
mode: KotlinJsBinaryMode, mode: KotlinJsBinaryMode,
jsBinaryType: JsBinaryType? jsBinaryType: KotlinJsBinaryType?
) = ) =
lowerCamelCaseName( lowerCamelCaseName(
compilation.name.let { if (it == KotlinCompilation.MAIN_COMPILATION_NAME) null else it }, compilation.name.let { if (it == KotlinCompilation.MAIN_COMPILATION_NAME) null else it },
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaryTypes.kt → libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryTypes.kt
+1 -1
View File
@@ -5,6 +5,6 @@
package org.jetbrains.kotlin.gradle.targets.js.ir package org.jetbrains.kotlin.gradle.targets.js.ir
enum class JsBinaryType { enum class KotlinJsBinaryType {
EXECUTABLE EXECUTABLE
} }