JS: drop "-kjsm" flag, merge logic with "-meta-info"

#KT-16049 Fixed

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt

@@ -4,12 +4,6 @@ package org.jetbrains.kotlin.gradle.dsl
 
 interface KotlinJsOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
 
-    /**
-     * Generate kjsm-files (for creating libraries)
-     * Default value: true
-     */
-     var kjsm: kotlin.Boolean
-
     /**
      * Whether a main function should be called
      * Possible values: "call", "noCall"
@@ -18,7 +12,7 @@ interface KotlinJsOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
      var main: kotlin.String
 
     /**
-     * Generate metadata
+     * Generate .meta.js and .kjsm files with metadata. Use to create a library
      * Default value: true
      */
      var metaInfo: kotlin.Boolean

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt

@@ -24,11 +24,6 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
         get() = verboseField ?: false
         set(value) { verboseField = value }
 
-    private var kjsmField: kotlin.Boolean? = null
-    override var kjsm: kotlin.Boolean
-        get() = kjsmField ?: true
-        set(value) { kjsmField = value }
-
     private var mainField: kotlin.String? = null
     override var main: kotlin.String
         get() = mainField ?: "call"
@@ -69,7 +64,6 @@ internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.Ko
         languageVersionField?.let { args.languageVersion = it }
         suppressWarningsField?.let { args.suppressWarnings = it }
         verboseField?.let { args.verbose = it }
-        kjsmField?.let { args.kjsm = it }
         mainField?.let { args.main = it }
         metaInfoField?.let { args.metaInfo = it }
         moduleKindField?.let { args.moduleKind = it }
@@ -85,7 +79,6 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fil
     languageVersion = "1.1"
     suppressWarnings = false
     verbose = false
-    kjsm = true
     main = "call"
     metaInfo = true
     moduleKind = "plain"

libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java

@@ -58,17 +58,11 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
     private String outputFile;
 
     /**
-     * Flag enables or disables metafile generation
+     * Flag enables or disables .meta.js and .kjsm files generation, used to create libraries
      */
     @Parameter(defaultValue = "true")
     private boolean metaInfo;
 
-    /**
-     * Flag enables or disables kjsm generation
-     */
-    @Parameter(defaultValue = "true")
-    private boolean kjsm;
-
     /**
      * Flags enables or disable source map generation
      */
@@ -95,7 +89,6 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
         arguments.outputFile = outputFile;
         arguments.noStdlib = true;
         arguments.metaInfo = metaInfo;
-        arguments.kjsm = kjsm;
         arguments.moduleKind = moduleKind;
 
         List<String> libraries = null;