From d3260bca27f420b266f979aaf050e0dfa52935d6 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 1 Jun 2020 13:25:27 +0300 Subject: [PATCH] [Gradle, JS] JsBinaryType to KotlinJsBinaryType --- .../gradle/targets/js/ir/KotlinJsBinaryContainer.kt | 10 +++++----- .../js/ir/{JsBinaryTypes.kt => KotlinJsBinaryTypes.kt} | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/{JsBinaryTypes.kt => KotlinJsBinaryTypes.kt} (89%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt index f17cc0ddca3..20598d8e5f1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt @@ -69,13 +69,13 @@ constructor( internal fun executableIrInternal(compilation: KotlinJsCompilation) = createBinaries( compilation = compilation, - jsBinaryType = JsBinaryType.EXECUTABLE, + jsBinaryType = KotlinJsBinaryType.EXECUTABLE, create = ::Executable ) private fun executableLegacyInternal(compilation: KotlinJsCompilation) = createBinaries( compilation = compilation, - jsBinaryType = JsBinaryType.EXECUTABLE, + jsBinaryType = KotlinJsBinaryType.EXECUTABLE, create = { compilation, name, type -> object : JsBinary { override val compilation: KotlinJsCompilation = compilation @@ -94,7 +94,7 @@ constructor( private fun createBinaries( compilation: KotlinJsCompilation, modes: Collection = listOf(PRODUCTION, DEVELOPMENT), - jsBinaryType: JsBinaryType, + jsBinaryType: KotlinJsBinaryType, create: (compilation: KotlinJsCompilation, name: String, mode: KotlinJsBinaryMode) -> T ) { modes.forEach { @@ -110,7 +110,7 @@ constructor( private fun createBinary( compilation: KotlinJsCompilation, mode: KotlinJsBinaryMode, - jsBinaryType: JsBinaryType, + jsBinaryType: KotlinJsBinaryType, create: (compilation: KotlinJsCompilation, name: String, mode: KotlinJsBinaryMode) -> T ) { val name = generateBinaryName( @@ -137,7 +137,7 @@ constructor( internal fun generateBinaryName( compilation: KotlinJsCompilation, mode: KotlinJsBinaryMode, - jsBinaryType: JsBinaryType? + jsBinaryType: KotlinJsBinaryType? ) = lowerCamelCaseName( compilation.name.let { if (it == KotlinCompilation.MAIN_COMPILATION_NAME) null else it }, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaryTypes.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryTypes.kt similarity index 89% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaryTypes.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryTypes.kt index 46d847cf638..7098dbfa7b3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaryTypes.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryTypes.kt @@ -5,6 +5,6 @@ package org.jetbrains.kotlin.gradle.targets.js.ir -enum class JsBinaryType { +enum class KotlinJsBinaryType { EXECUTABLE } \ No newline at end of file