Revert default value for "main" parameter for Gradle JS plugin to "call"

#KT-14724 fixed
This commit is contained in:
Alexey Tsvetkov
2016-11-11 21:25:05 +03:00
parent ab0af43a6a
commit f381f1e699
3 changed files with 4 additions and 4 deletions
@@ -49,7 +49,7 @@ open class DefaultValues(val defaultValue: String, val possibleValues: List<Stri
) )
object JsMain : DefaultValues( object JsMain : DefaultValues(
"\"" + NO_CALL + "\"", "\"" + CALL + "\"",
listOf("\"" + CALL + "\"", "\"" + NO_CALL + "\"") listOf("\"" + CALL + "\"", "\"" + NO_CALL + "\"")
) )
} }
@@ -13,7 +13,7 @@ interface KotlinJsOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
/** /**
* Whether a main function should be called * Whether a main function should be called
* Possible values: "call", "noCall" * Possible values: "call", "noCall"
* Default value: "noCall" * Default value: "call"
*/ */
var main: kotlin.String var main: kotlin.String
@@ -31,7 +31,7 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
private var mainField: kotlin.String? = null private var mainField: kotlin.String? = null
override var main: kotlin.String override var main: kotlin.String
get() = mainField ?: "noCall" get() = mainField ?: "call"
set(value) { mainField = value } set(value) { mainField = value }
private var metaInfoField: kotlin.Boolean? = null private var metaInfoField: kotlin.Boolean? = null
@@ -86,7 +86,7 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fil
suppressWarnings = false suppressWarnings = false
verbose = false verbose = false
kjsm = true kjsm = true
main = "noCall" main = "call"
metaInfo = true metaInfo = true
moduleKind = "plain" moduleKind = "plain"
noStdlib = true noStdlib = true