Introduce Kotlin compiler options with Gradle Properties API types

Old one is deprecated and delegates to new options. All new options
are marked with task input types, so they could be used as `@Nested`
input.

Generated options are using specific types in generated
compiler options. This should simplify code completion and provide
meaningful hints to user.

At this point repository compilation will fail.

^KT-27301 In Progress

libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsDiagnosticMode.kt

@@ -1,9 +1,11 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-enum class JsDiagnosticMode (val mode: String) {
+enum class JsDiagnosticMode(val mode: String) {
     RUNTIME_DIAGNOSTIC_EXCEPTION("exception"),
     RUNTIME_DIAGNOSTIC_LOG("log");
 

libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsMainFunctionExecutionMode.kt

@@ -1,9 +1,11 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-enum class JsMainFunctionExecutionMode (val mode: String) {
+enum class JsMainFunctionExecutionMode(val mode: String) {
     CALL("call"),
     NO_CALL("noCall");
 

libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsModuleKind.kt

@@ -1,9 +1,11 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-enum class JsModuleKind (val kind: String) {
+enum class JsModuleKind(val kind: String) {
     MODULE_AMD("amd"),
     MODULE_PLAIN("plain"),
     MODULE_ES("es"),

libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JsSourceMapEmbedMode.kt

@@ -1,9 +1,11 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-enum class JsSourceMapEmbedMode (val mode: String) {
+enum class JsSourceMapEmbedMode(val mode: String) {
     SOURCE_MAP_SOURCE_CONTENT_INLINING("inlining"),
     SOURCE_MAP_SOURCE_CONTENT_NEVER("never"),
     SOURCE_MAP_SOURCE_CONTENT_ALWAYS("always");

libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/JvmTarget.kt

@@ -1,9 +1,11 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-enum class JvmTarget (val target: String) {
+enum class JvmTarget(val target: String) {
     @Deprecated("Will be removed soon") JVM_1_6("1.6"),
     JVM_1_8("1.8"),
     JVM_9("9"),

libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt

@@ -1,9 +1,11 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-enum class KotlinVersion (val version: String) {
+enum class KotlinVersion(val version: String) {
     @Deprecated("Unsupported", level = DeprecationLevel.ERROR) KOTLIN_1_0("1.0"),
     @Deprecated("Unsupported", level = DeprecationLevel.ERROR) KOTLIN_1_1("1.1"),
     @Deprecated("Unsupported", level = DeprecationLevel.ERROR) KOTLIN_1_2("1.2"),

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions.kt

@@ -0,0 +1,34 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+interface CompilerCommonOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions {
+
+    /**
+     * Allow using declarations only from the specified version of bundled libraries
+     * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8", "1.9 (experimental)"
+     * Default value: null
+     */
+    @get:org.gradle.api.tasks.Optional
+    @get:org.gradle.api.tasks.Input
+    val apiVersion: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.KotlinVersion>
+
+    /**
+     * Provide source compatibility with the specified version of Kotlin
+     * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8", "1.9 (experimental)"
+     * Default value: null
+     */
+    @get:org.gradle.api.tasks.Optional
+    @get:org.gradle.api.tasks.Input
+    val languageVersion: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.KotlinVersion>
+
+    /**
+     * Compile using experimental K2. K2 is a new compiler pipeline, no compatibility guarantees are yet provided
+     * Default value: false
+     */
+    @get:org.gradle.api.tasks.Input
+    val useK2: org.gradle.api.provider.Property<kotlin.Boolean>
+}

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptions.kt

@@ -0,0 +1,37 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+interface CompilerCommonToolOptions {
+
+    /**
+     * Report an error if there are any warnings
+     * Default value: false
+     */
+    @get:org.gradle.api.tasks.Input
+    val allWarningsAsErrors: org.gradle.api.provider.Property<kotlin.Boolean>
+
+    /**
+     * Generate no warnings
+     * Default value: false
+     */
+    @get:org.gradle.api.tasks.Internal
+    val suppressWarnings: org.gradle.api.provider.Property<kotlin.Boolean>
+
+    /**
+     * Enable verbose logging output
+     * Default value: false
+     */
+    @get:org.gradle.api.tasks.Internal
+    val verbose: org.gradle.api.provider.Property<kotlin.Boolean>
+
+    /**
+     * A list of additional compiler arguments
+     * Default value: emptyList<String>()
+     */
+    @get:org.gradle.api.tasks.Input
+    val freeCompilerArgs: org.gradle.api.provider.ListProperty<kotlin.String>
+}

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptions.kt

@@ -0,0 +1,24 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+interface CompilerJsDceOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions {
+
+    /**
+     * Development mode: don't strip out any code, just copy dependencies
+     * Default value: false
+     */
+    @get:org.gradle.api.tasks.Input
+    val devMode: org.gradle.api.provider.Property<kotlin.Boolean>
+
+    /**
+     * Output directory
+     * Default value: null
+     */
+    @Deprecated(message = "Use task 'destinationDirectory' to configure output directory", level = DeprecationLevel.WARNING)
+    @get:org.gradle.api.tasks.Internal
+    val outputDirectory: org.gradle.api.provider.Property<kotlin.String>
+}

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsOptions.kt

@@ -0,0 +1,93 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+interface CompilerJsOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions {
+
+    /**
+     * Disable internal declaration export
+     * Default value: false
+     */
+    @get:org.gradle.api.tasks.Input
+    val friendModulesDisabled: org.gradle.api.provider.Property<kotlin.Boolean>
+
+    /**
+     * Define whether the `main` function should be called upon execution
+     * Possible values: "call", "noCall"
+     * Default value: org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode.CALL
+     */
+    @get:org.gradle.api.tasks.Input
+    val main: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode>
+
+    /**
+     * Generate .meta.js and .kjsm files with metadata. Use to create a library
+     * Default value: true
+     */
+    @get:org.gradle.api.tasks.Input
+    val metaInfo: org.gradle.api.provider.Property<kotlin.Boolean>
+
+    /**
+     * Kind of the JS module generated by the compiler
+     * Possible values: "plain", "amd", "commonjs", "umd"
+     * Default value: org.jetbrains.kotlin.gradle.dsl.JsModuleKind.MODULE_PLAIN
+     */
+    @get:org.gradle.api.tasks.Input
+    val moduleKind: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.JsModuleKind>
+
+    /**
+     * Don't automatically include the default Kotlin/JS stdlib into compilation dependencies
+     * Default value: true
+     */
+    @get:org.gradle.api.tasks.Input
+    val noStdlib: org.gradle.api.provider.Property<kotlin.Boolean>
+
+    /**
+     * Destination *.js file for the compilation result
+     * Default value: null
+     */
+    @Deprecated(message = "Use task 'outputFileProperty' to specify location", level = DeprecationLevel.WARNING)
+    @get:org.gradle.api.tasks.Internal
+    val outputFile: org.gradle.api.provider.Property<kotlin.String>
+
+    /**
+     * Generate source map
+     * Default value: false
+     */
+    @get:org.gradle.api.tasks.Input
+    val sourceMap: org.gradle.api.provider.Property<kotlin.Boolean>
+
+    /**
+     * Embed source files into source map
+     * Possible values: "never", "always", "inlining"
+     * Default value: null
+     */
+    @get:org.gradle.api.tasks.Optional
+    @get:org.gradle.api.tasks.Input
+    val sourceMapEmbedSources: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.JsSourceMapEmbedMode>
+
+    /**
+     * Add the specified prefix to paths in the source map
+     * Default value: null
+     */
+    @get:org.gradle.api.tasks.Optional
+    @get:org.gradle.api.tasks.Input
+    val sourceMapPrefix: org.gradle.api.provider.Property<kotlin.String>
+
+    /**
+     * Generate JS files for specific ECMA version
+     * Possible values: "v5"
+     * Default value: "v5"
+     */
+    @get:org.gradle.api.tasks.Input
+    val target: org.gradle.api.provider.Property<kotlin.String>
+
+    /**
+     * Translate primitive arrays to JS typed arrays
+     * Default value: true
+     */
+    @get:org.gradle.api.tasks.Input
+    val typedArrays: org.gradle.api.provider.Property<kotlin.Boolean>
+}

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJvmOptions.kt

@@ -0,0 +1,40 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+interface CompilerJvmOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions {
+
+    /**
+     * Generate metadata for Java 1.8 reflection on method parameters
+     * Default value: false
+     */
+    @get:org.gradle.api.tasks.Input
+    val javaParameters: org.gradle.api.provider.Property<kotlin.Boolean>
+
+    /**
+     * Target version of the generated JVM bytecode (1.8, 9, 10, ..., 18), default is 1.8
+     * Possible values: "1.8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18"
+     * Default value: null
+     */
+    @get:org.gradle.api.tasks.Optional
+    @get:org.gradle.api.tasks.Input
+    val jvmTarget: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.JvmTarget>
+
+    /**
+     * Name of the generated .kotlin_module file
+     * Default value: null
+     */
+    @get:org.gradle.api.tasks.Optional
+    @get:org.gradle.api.tasks.Input
+    val moduleName: org.gradle.api.provider.Property<kotlin.String>
+
+    /**
+     * Don't automatically include the Java runtime into the classpath
+     * Default value: false
+     */
+    @get:org.gradle.api.tasks.Input
+    val noJdk: org.gradle.api.provider.Property<kotlin.Boolean>
+}

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptions.kt

@@ -0,0 +1,9 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+interface CompilerMultiplatformCommonOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions {
+}

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt

@@ -1,27 +1,45 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-interface KotlinCommonOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions {
+@Deprecated("Use CompilerCommonOptions instead", level = DeprecationLevel.WARNING)
+interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions {
+    override val options: org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions
+
+    private val kotlin.String?.apiVersionCompilerOption get() = if (this != null) org.jetbrains.kotlin.gradle.dsl.KotlinVersion.fromVersion(this) else null
+
+    private val org.jetbrains.kotlin.gradle.dsl.KotlinVersion?.apiVersionKotlinOption get() = this?.version
 
     /**
      * Allow using declarations only from the specified version of bundled libraries
      * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8", "1.9 (experimental)"
      * Default value: null
      */
-     var apiVersion: kotlin.String?
+    var apiVersion: kotlin.String?
+        get() = options.apiVersion.orNull.apiVersionKotlinOption
+        set(value) = options.apiVersion.set(value.apiVersionCompilerOption)
+
+    private val kotlin.String?.languageVersionCompilerOption get() = if (this != null) org.jetbrains.kotlin.gradle.dsl.KotlinVersion.fromVersion(this) else null
+
+    private val org.jetbrains.kotlin.gradle.dsl.KotlinVersion?.languageVersionKotlinOption get() = this?.version
 
     /**
      * Provide source compatibility with the specified version of Kotlin
      * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8", "1.9 (experimental)"
      * Default value: null
      */
-     var languageVersion: kotlin.String?
+    var languageVersion: kotlin.String?
+        get() = options.languageVersion.orNull.languageVersionKotlinOption
+        set(value) = options.languageVersion.set(value.languageVersionCompilerOption)
 
     /**
      * Compile using experimental K2. K2 is a new compiler pipeline, no compatibility guarantees are yet provided
      * Default value: false
      */
-     var useK2: kotlin.Boolean
+    var useK2: kotlin.Boolean
+        get() = options.useK2.get()
+        set(value) = options.useK2.set(value)
 }

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt

@@ -1,31 +1,43 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
+@Deprecated("Use CompilerCommonToolOptions instead", level = DeprecationLevel.WARNING)
 interface KotlinCommonToolOptions {
+    val options: org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions
 
     /**
      * Report an error if there are any warnings
      * Default value: false
      */
-     var allWarningsAsErrors: kotlin.Boolean
+    var allWarningsAsErrors: kotlin.Boolean
+        get() = options.allWarningsAsErrors.get()
+        set(value) = options.allWarningsAsErrors.set(value)
 
     /**
      * Generate no warnings
      * Default value: false
      */
-     var suppressWarnings: kotlin.Boolean
+    var suppressWarnings: kotlin.Boolean
+        get() = options.suppressWarnings.get()
+        set(value) = options.suppressWarnings.set(value)
 
     /**
      * Enable verbose logging output
      * Default value: false
      */
-     var verbose: kotlin.Boolean
+    var verbose: kotlin.Boolean
+        get() = options.verbose.get()
+        set(value) = options.verbose.set(value)
 
     /**
      * A list of additional compiler arguments
-     * Default value: emptyList()
+     * Default value: emptyList<String>()
      */
-     var freeCompilerArgs: kotlin.collections.List<kotlin.String>
+    var freeCompilerArgs: kotlin.collections.List<kotlin.String>
+        get() = options.freeCompilerArgs.get()
+        set(value) = options.freeCompilerArgs.set(value)
 }

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt

@@ -1,19 +1,28 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-interface KotlinJsDceOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions {
+@Deprecated("Use CompilerJsDceOptions instead", level = DeprecationLevel.WARNING)
+interface KotlinJsDceOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions {
+    override val options: org.jetbrains.kotlin.gradle.dsl.CompilerJsDceOptions
 
     /**
      * Development mode: don't strip out any code, just copy dependencies
      * Default value: false
      */
-     var devMode: kotlin.Boolean
+    var devMode: kotlin.Boolean
+        get() = options.devMode.get()
+        set(value) = options.devMode.set(value)
 
     /**
      * Output directory
      * Default value: null
      */
-     var outputDirectory: kotlin.String?
+    @Deprecated(message = "Use task 'destinationDirectory' to configure output directory", level = DeprecationLevel.WARNING)
+    var outputDirectory: kotlin.String?
+        get() = options.outputDirectory.orNull
+        set(value) = options.outputDirectory.set(value)
 }

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

@@ -1,77 +1,116 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-interface KotlinJsOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
+@Deprecated("Use CompilerJsOptions instead", level = DeprecationLevel.WARNING)
+interface KotlinJsOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
+    override val options: org.jetbrains.kotlin.gradle.dsl.CompilerJsOptions
 
     /**
      * Disable internal declaration export
      * Default value: false
      */
-     var friendModulesDisabled: kotlin.Boolean
+    var friendModulesDisabled: kotlin.Boolean
+        get() = options.friendModulesDisabled.get()
+        set(value) = options.friendModulesDisabled.set(value)
+
+    private val kotlin.String.mainCompilerOption get() = org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode.fromMode(this)
+
+    private val org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode.mainKotlinOption get() = this.mode
 
     /**
      * Define whether the `main` function should be called upon execution
      * Possible values: "call", "noCall"
-     * Default value: "call"
+     * Default value: org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode.CALL
      */
-     var main: kotlin.String
+    var main: kotlin.String
+        get() = options.main.get().mainKotlinOption
+        set(value) = options.main.set(value.mainCompilerOption)
 
     /**
      * Generate .meta.js and .kjsm files with metadata. Use to create a library
      * Default value: true
      */
-     var metaInfo: kotlin.Boolean
+    var metaInfo: kotlin.Boolean
+        get() = options.metaInfo.get()
+        set(value) = options.metaInfo.set(value)
+
+    private val kotlin.String.moduleKindCompilerOption get() = org.jetbrains.kotlin.gradle.dsl.JsModuleKind.fromKind(this)
+
+    private val org.jetbrains.kotlin.gradle.dsl.JsModuleKind.moduleKindKotlinOption get() = this.kind
 
     /**
      * Kind of the JS module generated by the compiler
      * Possible values: "plain", "amd", "commonjs", "umd"
-     * Default value: "plain"
+     * Default value: org.jetbrains.kotlin.gradle.dsl.JsModuleKind.MODULE_PLAIN
      */
-     var moduleKind: kotlin.String
+    var moduleKind: kotlin.String
+        get() = options.moduleKind.get().moduleKindKotlinOption
+        set(value) = options.moduleKind.set(value.moduleKindCompilerOption)
 
     /**
      * Don't automatically include the default Kotlin/JS stdlib into compilation dependencies
      * Default value: true
      */
-     var noStdlib: kotlin.Boolean
+    var noStdlib: kotlin.Boolean
+        get() = options.noStdlib.get()
+        set(value) = options.noStdlib.set(value)
 
     /**
      * Destination *.js file for the compilation result
      * Default value: null
      */
-     var outputFile: kotlin.String?
+    @Deprecated(message = "Use task 'outputFileProperty' to specify location", level = DeprecationLevel.WARNING)
+    var outputFile: kotlin.String?
+        get() = options.outputFile.orNull
+        set(value) = options.outputFile.set(value)
 
     /**
      * Generate source map
      * Default value: false
      */
-     var sourceMap: kotlin.Boolean
+    var sourceMap: kotlin.Boolean
+        get() = options.sourceMap.get()
+        set(value) = options.sourceMap.set(value)
+
+    private val kotlin.String?.sourceMapEmbedSourcesCompilerOption get() = this?.let { org.jetbrains.kotlin.gradle.dsl.JsSourceMapEmbedMode.fromMode(it) }
+
+    private val org.jetbrains.kotlin.gradle.dsl.JsSourceMapEmbedMode?.sourceMapEmbedSourcesKotlinOption get() = this?.mode
 
     /**
      * Embed source files into source map
      * Possible values: "never", "always", "inlining"
      * Default value: null
      */
-     var sourceMapEmbedSources: kotlin.String?
+    var sourceMapEmbedSources: kotlin.String?
+        get() = options.sourceMapEmbedSources.orNull.sourceMapEmbedSourcesKotlinOption
+        set(value) = options.sourceMapEmbedSources.set(value.sourceMapEmbedSourcesCompilerOption)
 
     /**
      * Add the specified prefix to paths in the source map
      * Default value: null
      */
-     var sourceMapPrefix: kotlin.String?
+    var sourceMapPrefix: kotlin.String?
+        get() = options.sourceMapPrefix.orNull
+        set(value) = options.sourceMapPrefix.set(value)
 
     /**
      * Generate JS files for specific ECMA version
      * Possible values: "v5"
      * Default value: "v5"
      */
-     var target: kotlin.String
+    var target: kotlin.String
+        get() = options.target.get()
+        set(value) = options.target.set(value)
 
     /**
      * Translate primitive arrays to JS typed arrays
      * Default value: true
      */
-     var typedArrays: kotlin.Boolean
+    var typedArrays: kotlin.Boolean
+        get() = options.typedArrays.get()
+        set(value) = options.typedArrays.set(value)
 }

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt

@@ -1,32 +1,48 @@
 // DO NOT EDIT MANUALLY!
 // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
 package org.jetbrains.kotlin.gradle.dsl
 
-@Suppress("DEPRECATION")
-interface KotlinJvmOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
+@Deprecated("Use CompilerJvmOptions instead", level = DeprecationLevel.WARNING)
+interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
+    override val options: org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions
 
     /**
      * Generate metadata for Java 1.8 reflection on method parameters
      * Default value: false
      */
-     var javaParameters: kotlin.Boolean
+    var javaParameters: kotlin.Boolean
+        get() = options.javaParameters.get()
+        set(value) = options.javaParameters.set(value)
+
+    private val kotlin.String?.jvmTargetCompilerOption get() = if (this != null) org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(this) else null
+
+    private val org.jetbrains.kotlin.gradle.dsl.JvmTarget?.jvmTargetKotlinOption get() = this?.target
 
     /**
      * Target version of the generated JVM bytecode (1.8, 9, 10, ..., 18), default is 1.8
      * Possible values: "1.8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18"
      * Default value: null
      */
-     var jvmTarget: kotlin.String?
+    var jvmTarget: kotlin.String?
+        get() = options.jvmTarget.orNull.jvmTargetKotlinOption
+        set(value) = options.jvmTarget.set(value.jvmTargetCompilerOption)
 
     /**
      * Name of the generated .kotlin_module file
      * Default value: null
      */
-     var moduleName: kotlin.String?
+    var moduleName: kotlin.String?
+        get() = options.moduleName.orNull
+        set(value) = options.moduleName.set(value)
 
     /**
      * Don't automatically include the Java runtime into the classpath
      * Default value: false
      */
-     var noJdk: kotlin.Boolean
+    var noJdk: kotlin.Boolean
+        get() = options.noJdk.get()
+        set(value) = options.noJdk.set(value)
 }

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt

@@ -0,0 +1,11 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+@Deprecated("Use CompilerMultiplatformCommonOptions instead", level = DeprecationLevel.WARNING)
+interface KotlinMultiplatformCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
+    override val options: org.jetbrains.kotlin.gradle.dsl.CompilerMultiplatformCommonOptions
+}

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -38,6 +38,7 @@ dependencies {
     commonCompileOnly(project(":compiler"))
     commonCompileOnly(project(":compiler:incremental-compilation-impl"))
     commonCompileOnly(project(":daemon-common"))
+    commonCompileOnly(project(":kotlin-gradle-compiler-types"))
     commonCompileOnly(project(":native:kotlin-native-utils"))
     commonCompileOnly(project(":kotlin-android-extensions"))
     commonCompileOnly(project(":kotlin-build-common"))

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptionsDefault.kt

@@ -0,0 +1,34 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+internal abstract class CompilerCommonOptionsDefault @javax.inject.Inject constructor(
+    objectFactory: org.gradle.api.model.ObjectFactory
+) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions {
+
+    override val apiVersion: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.KotlinVersion> =
+        objectFactory.property(org.jetbrains.kotlin.gradle.dsl.KotlinVersion::class.java)
+
+    override val languageVersion: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.KotlinVersion> =
+        objectFactory.property(org.jetbrains.kotlin.gradle.dsl.KotlinVersion::class.java)
+
+    override val useK2: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(false)
+
+    internal fun fillCompilerArguments(args: org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments) {
+        super.fillCompilerArguments(args)
+        args.apiVersion = apiVersion.orNull?.version
+        args.languageVersion = languageVersion.orNull?.version
+        args.useK2 = useK2.get()
+    }
+
+    internal fun fillDefaultValues(args: org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments) {
+        super.fillDefaultValues(args)
+        args.apiVersion = null
+        args.languageVersion = null
+        args.useK2 = false
+    }
+}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptionsDefault.kt

@@ -0,0 +1,36 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+internal abstract class CompilerCommonToolOptionsDefault @javax.inject.Inject constructor(
+    objectFactory: org.gradle.api.model.ObjectFactory
+) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions {
+
+    override val allWarningsAsErrors: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(false)
+
+    override val suppressWarnings: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(false)
+
+    override val verbose: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(false)
+
+    override val freeCompilerArgs: org.gradle.api.provider.ListProperty<kotlin.String> =
+        objectFactory.listProperty(kotlin.String::class.java).convention(emptyList<String>())
+
+    internal fun fillCompilerArguments(args: org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments) {
+        args.allWarningsAsErrors = allWarningsAsErrors.get()
+        args.suppressWarnings = suppressWarnings.get()
+        args.verbose = verbose.get()
+        args.freeArgs += freeCompilerArgs.get()
+    }
+
+    internal fun fillDefaultValues(args: org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments) {
+        args.allWarningsAsErrors = false
+        args.suppressWarnings = false
+        args.verbose = false
+    }
+}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptionsDefault.kt

@@ -0,0 +1,30 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+internal abstract class CompilerJsDceOptionsDefault @javax.inject.Inject constructor(
+    objectFactory: org.gradle.api.model.ObjectFactory
+) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerJsDceOptions {
+
+    override val devMode: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(false)
+
+    @Deprecated(message = "Use task 'destinationDirectory' to configure output directory", level = DeprecationLevel.WARNING)
+    override val outputDirectory: org.gradle.api.provider.Property<kotlin.String> =
+        objectFactory.property(kotlin.String::class.java)
+
+    internal fun fillCompilerArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments) {
+        super.fillCompilerArguments(args)
+        args.devMode = devMode.get()
+        args.outputDirectory = outputDirectory.orNull
+    }
+
+    internal fun fillDefaultValues(args: org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments) {
+        super.fillDefaultValues(args)
+        args.devMode = false
+        args.outputDirectory = null
+    }
+}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsOptionsDefault.kt

@@ -0,0 +1,75 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+internal abstract class CompilerJsOptionsDefault @javax.inject.Inject constructor(
+    objectFactory: org.gradle.api.model.ObjectFactory
+) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerJsOptions {
+
+    override val friendModulesDisabled: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(false)
+
+    override val main: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode> =
+        objectFactory.property(org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode::class.java).convention(org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode.CALL)
+
+    override val metaInfo: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(true)
+
+    override val moduleKind: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.JsModuleKind> =
+        objectFactory.property(org.jetbrains.kotlin.gradle.dsl.JsModuleKind::class.java).convention(org.jetbrains.kotlin.gradle.dsl.JsModuleKind.MODULE_PLAIN)
+
+    override val noStdlib: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(true)
+
+    @Deprecated(message = "Use task 'outputFileProperty' to specify location", level = DeprecationLevel.WARNING)
+    override val outputFile: org.gradle.api.provider.Property<kotlin.String> =
+        objectFactory.property(kotlin.String::class.java)
+
+    override val sourceMap: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(false)
+
+    override val sourceMapEmbedSources: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.JsSourceMapEmbedMode> =
+        objectFactory.property(org.jetbrains.kotlin.gradle.dsl.JsSourceMapEmbedMode::class.java)
+
+    override val sourceMapPrefix: org.gradle.api.provider.Property<kotlin.String> =
+        objectFactory.property(kotlin.String::class.java)
+
+    override val target: org.gradle.api.provider.Property<kotlin.String> =
+        objectFactory.property(kotlin.String::class.java).convention("v5")
+
+    override val typedArrays: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(true)
+
+    internal fun fillCompilerArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments) {
+        super.fillCompilerArguments(args)
+        args.friendModulesDisabled = friendModulesDisabled.get()
+        args.main = main.get().mode
+        args.metaInfo = metaInfo.get()
+        args.moduleKind = moduleKind.get().kind
+        args.noStdlib = noStdlib.get()
+        args.outputFile = outputFile.orNull
+        args.sourceMap = sourceMap.get()
+        args.sourceMapEmbedSources = sourceMapEmbedSources.orNull?.mode
+        args.sourceMapPrefix = sourceMapPrefix.orNull
+        args.target = target.get()
+        args.typedArrays = typedArrays.get()
+    }
+
+    internal fun fillDefaultValues(args: org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments) {
+        super.fillDefaultValues(args)
+        args.friendModulesDisabled = false
+        args.main = org.jetbrains.kotlin.gradle.dsl.JsMainFunctionExecutionMode.CALL.mode
+        args.metaInfo = true
+        args.moduleKind = org.jetbrains.kotlin.gradle.dsl.JsModuleKind.MODULE_PLAIN.kind
+        args.noStdlib = true
+        args.outputFile = null
+        args.sourceMap = false
+        args.sourceMapEmbedSources = null
+        args.sourceMapPrefix = null
+        args.target = "v5"
+        args.typedArrays = true
+    }
+}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJvmOptionsDefault.kt

@@ -0,0 +1,47 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+internal abstract class CompilerJvmOptionsDefault @javax.inject.Inject constructor(
+    objectFactory: org.gradle.api.model.ObjectFactory
+) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions {
+
+    override val javaParameters: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(false)
+
+    override val jvmTarget: org.gradle.api.provider.Property<org.jetbrains.kotlin.gradle.dsl.JvmTarget> =
+        objectFactory.property(org.jetbrains.kotlin.gradle.dsl.JvmTarget::class.java)
+
+    override val moduleName: org.gradle.api.provider.Property<kotlin.String> =
+        objectFactory.property(kotlin.String::class.java)
+
+    override val noJdk: org.gradle.api.provider.Property<kotlin.Boolean> =
+        objectFactory.property(kotlin.Boolean::class.java).convention(false)
+
+    internal fun fillCompilerArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments) {
+        super.fillCompilerArguments(args)
+        args.javaParameters = javaParameters.get()
+        args.jvmTarget = jvmTarget.orNull?.target
+        args.moduleName = moduleName.orNull
+        args.noJdk = noJdk.get()
+
+        // Arguments with always default values when used from build tools
+        args.noStdlib = true
+        args.noReflect = true
+    }
+
+    internal fun fillDefaultValues(args: org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments) {
+        super.fillDefaultValues(args)
+        args.javaParameters = false
+        args.jvmTarget = null
+        args.moduleName = null
+        args.noJdk = false
+
+        // Arguments with always default values when used from build tools
+        args.noStdlib = true
+        args.noReflect = true
+    }
+}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptionsDefault.kt

@@ -0,0 +1,19 @@
+// DO NOT EDIT MANUALLY!
+// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+// To regenerate run 'generateGradleOptions' task
+@file:Suppress("RemoveRedundantQualifierName", "Deprecation", "DuplicatedCode")
+
+package org.jetbrains.kotlin.gradle.dsl
+
+internal abstract class CompilerMultiplatformCommonOptionsDefault @javax.inject.Inject constructor(
+    objectFactory: org.gradle.api.model.ObjectFactory
+) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerMultiplatformCommonOptions {
+
+    internal fun fillCompilerArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments) {
+        super.fillCompilerArguments(args)
+    }
+
+    internal fun fillDefaultValues(args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments) {
+        super.fillDefaultValues(args)
+    }
+}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsBase.kt

@@ -1,53 +0,0 @@
-// DO NOT EDIT MANUALLY!
-// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
-package org.jetbrains.kotlin.gradle.dsl
-
-@Suppress("DEPRECATION")
-internal abstract class KotlinJsDceOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJsDceOptions {
-
-    private var allWarningsAsErrorsField: kotlin.Boolean? = null
-    override var allWarningsAsErrors: kotlin.Boolean
-        get() = allWarningsAsErrorsField ?: false
-        set(value) {
-            allWarningsAsErrorsField = value
-        }
-
-    private var suppressWarningsField: kotlin.Boolean? = null
-    override var suppressWarnings: kotlin.Boolean
-        get() = suppressWarningsField ?: false
-        set(value) {
-            suppressWarningsField = value
-        }
-
-    private var verboseField: kotlin.Boolean? = null
-    override var verbose: kotlin.Boolean
-        get() = verboseField ?: false
-        set(value) {
-            verboseField = value
-        }
-
-    private var devModeField: kotlin.Boolean? = null
-    override var devMode: kotlin.Boolean
-        get() = devModeField ?: false
-        set(value) {
-            devModeField = value
-        }
-
-    override var outputDirectory: kotlin.String? = null
-
-    internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments) {
-        allWarningsAsErrorsField?.let { args.allWarningsAsErrors = it }
-        suppressWarningsField?.let { args.suppressWarnings = it }
-        verboseField?.let { args.verbose = it }
-        devModeField?.let { args.devMode = it }
-        outputDirectory?.let { args.outputDirectory = it }
-    }
-}
-
-internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments.fillDefaultValues() {
-    allWarningsAsErrors = false
-    suppressWarnings = false
-    verbose = false
-    devMode = false
-    outputDirectory = null
-}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsImpl.kt

@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.gradle.dsl
-
-import org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments
-
-internal class KotlinJsDceOptionsImpl : KotlinJsDceOptionsBase() {
-    override var freeCompilerArgs: List<String> = listOf()
-
-    override fun updateArguments(args: K2JSDceArguments) {
-        super.updateArguments(args)
-        copyFreeCompilerArgsToArgs(args)
-    }
-}

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

@@ -1,141 +0,0 @@
-// DO NOT EDIT MANUALLY!
-// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
-package org.jetbrains.kotlin.gradle.dsl
-
-@Suppress("DEPRECATION")
-internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions {
-
-    private var allWarningsAsErrorsField: kotlin.Boolean? = null
-    override var allWarningsAsErrors: kotlin.Boolean
-        get() = allWarningsAsErrorsField ?: false
-        set(value) {
-            allWarningsAsErrorsField = value
-        }
-
-    private var suppressWarningsField: kotlin.Boolean? = null
-    override var suppressWarnings: kotlin.Boolean
-        get() = suppressWarningsField ?: false
-        set(value) {
-            suppressWarningsField = value
-        }
-
-    private var verboseField: kotlin.Boolean? = null
-    override var verbose: kotlin.Boolean
-        get() = verboseField ?: false
-        set(value) {
-            verboseField = value
-        }
-
-    override var apiVersion: kotlin.String? = null
-
-    override var languageVersion: kotlin.String? = null
-
-    private var useK2Field: kotlin.Boolean? = null
-    override var useK2: kotlin.Boolean
-        get() = useK2Field ?: false
-        set(value) {
-            useK2Field = value
-        }
-
-    private var friendModulesDisabledField: kotlin.Boolean? = null
-    override var friendModulesDisabled: kotlin.Boolean
-        get() = friendModulesDisabledField ?: false
-        set(value) {
-            friendModulesDisabledField = value
-        }
-
-    private var mainField: kotlin.String? = null
-    override var main: kotlin.String
-        get() = mainField ?: "call"
-        set(value) {
-            mainField = value
-        }
-
-    private var metaInfoField: kotlin.Boolean? = null
-    override var metaInfo: kotlin.Boolean
-        get() = metaInfoField ?: true
-        set(value) {
-            metaInfoField = value
-        }
-
-    private var moduleKindField: kotlin.String? = null
-    override var moduleKind: kotlin.String
-        get() = moduleKindField ?: "plain"
-        set(value) {
-            moduleKindField = value
-        }
-
-    private var noStdlibField: kotlin.Boolean? = null
-    override var noStdlib: kotlin.Boolean
-        get() = noStdlibField ?: true
-        set(value) {
-            noStdlibField = value
-        }
-
-    override var outputFile: kotlin.String? = null
-
-    private var sourceMapField: kotlin.Boolean? = null
-    override var sourceMap: kotlin.Boolean
-        get() = sourceMapField ?: false
-        set(value) {
-            sourceMapField = value
-        }
-
-    override var sourceMapEmbedSources: kotlin.String? = null
-
-    override var sourceMapPrefix: kotlin.String? = null
-
-    private var targetField: kotlin.String? = null
-    override var target: kotlin.String
-        get() = targetField ?: "v5"
-        set(value) {
-            targetField = value
-        }
-
-    private var typedArraysField: kotlin.Boolean? = null
-    override var typedArrays: kotlin.Boolean
-        get() = typedArraysField ?: true
-        set(value) {
-            typedArraysField = value
-        }
-
-    internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments) {
-        allWarningsAsErrorsField?.let { args.allWarningsAsErrors = it }
-        suppressWarningsField?.let { args.suppressWarnings = it }
-        verboseField?.let { args.verbose = it }
-        apiVersion?.let { args.apiVersion = it }
-        languageVersion?.let { args.languageVersion = it }
-        useK2Field?.let { args.useK2 = it }
-        friendModulesDisabledField?.let { args.friendModulesDisabled = it }
-        mainField?.let { args.main = it }
-        metaInfoField?.let { args.metaInfo = it }
-        moduleKindField?.let { args.moduleKind = it }
-        noStdlibField?.let { args.noStdlib = it }
-        outputFile?.let { args.outputFile = it }
-        sourceMapField?.let { args.sourceMap = it }
-        sourceMapEmbedSources?.let { args.sourceMapEmbedSources = it }
-        sourceMapPrefix?.let { args.sourceMapPrefix = it }
-        targetField?.let { args.target = it }
-        typedArraysField?.let { args.typedArrays = it }
-    }
-}
-
-internal fun org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments.fillDefaultValues() {
-    allWarningsAsErrors = false
-    suppressWarnings = false
-    verbose = false
-    apiVersion = null
-    languageVersion = null
-    useK2 = false
-    friendModulesDisabled = false
-    main = "call"
-    metaInfo = true
-    moduleKind = "plain"
-    noStdlib = true
-    outputFile = null
-    sourceMap = false
-    sourceMapEmbedSources = null
-    sourceMapPrefix = null
-    target = "v5"
-    typedArrays = true
-}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.gradle.dsl
-
-import org.gradle.api.file.FileCollection
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-
-internal class KotlinJsOptionsImpl : KotlinJsOptionsBase() {
-    override var freeCompilerArgs: List<String> = listOf()
-
-    var sourceMapBaseDirs: FileCollection? = null
-
-    override fun updateArguments(args: K2JSCompilerArguments) {
-        super.updateArguments(args)
-        copyFreeCompilerArgsToArgs(args)
-        sourceMapBaseDirs?.let {
-            args.sourceMapBaseDirs = it.asPath
-        }
-    }
-}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt

@@ -1,85 +0,0 @@
-// DO NOT EDIT MANUALLY!
-// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
-package org.jetbrains.kotlin.gradle.dsl
-
-@Suppress("DEPRECATION")
-internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions {
-
-    private var allWarningsAsErrorsField: kotlin.Boolean? = null
-    override var allWarningsAsErrors: kotlin.Boolean
-        get() = allWarningsAsErrorsField ?: false
-        set(value) {
-            allWarningsAsErrorsField = value
-        }
-
-    private var suppressWarningsField: kotlin.Boolean? = null
-    override var suppressWarnings: kotlin.Boolean
-        get() = suppressWarningsField ?: false
-        set(value) {
-            suppressWarningsField = value
-        }
-
-    private var verboseField: kotlin.Boolean? = null
-    override var verbose: kotlin.Boolean
-        get() = verboseField ?: false
-        set(value) {
-            verboseField = value
-        }
-
-    override var apiVersion: kotlin.String? = null
-
-    override var languageVersion: kotlin.String? = null
-
-    private var useK2Field: kotlin.Boolean? = null
-    override var useK2: kotlin.Boolean
-        get() = useK2Field ?: false
-        set(value) {
-            useK2Field = value
-        }
-
-    private var javaParametersField: kotlin.Boolean? = null
-    override var javaParameters: kotlin.Boolean
-        get() = javaParametersField ?: false
-        set(value) {
-            javaParametersField = value
-        }
-
-    override var jvmTarget: kotlin.String? = null
-
-    override var moduleName: kotlin.String? = null
-
-    private var noJdkField: kotlin.Boolean? = null
-    override var noJdk: kotlin.Boolean
-        get() = noJdkField ?: false
-        set(value) {
-            noJdkField = value
-        }
-
-    internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments) {
-        allWarningsAsErrorsField?.let { args.allWarningsAsErrors = it }
-        suppressWarningsField?.let { args.suppressWarnings = it }
-        verboseField?.let { args.verbose = it }
-        apiVersion?.let { args.apiVersion = it }
-        languageVersion?.let { args.languageVersion = it }
-        useK2Field?.let { args.useK2 = it }
-        javaParametersField?.let { args.javaParameters = it }
-        jvmTarget?.let { args.jvmTarget = it }
-        moduleName?.let { args.moduleName = it }
-        noJdkField?.let { args.noJdk = it }
-    }
-}
-
-internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fillDefaultValues() {
-    allWarningsAsErrors = false
-    suppressWarnings = false
-    verbose = false
-    apiVersion = null
-    languageVersion = null
-    useK2 = false
-    javaParameters = false
-    jvmTarget = null
-    moduleName = null
-    noJdk = false
-    noStdlib = true
-    noReflect = true
-}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImpl.kt

@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.gradle.dsl
-
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-
-internal class KotlinJvmOptionsImpl : KotlinJvmOptionsBase() {
-    override var freeCompilerArgs: List<String> = listOf()
-
-    override fun updateArguments(args: K2JVMCompilerArguments) {
-        super.updateArguments(args)
-        copyFreeCompilerArgsToArgs(args)
-    }
-}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt

@@ -1,7 +0,0 @@
-// DO NOT EDIT MANUALLY!
-// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
-package org.jetbrains.kotlin.gradle.dsl
-
-@Suppress("DEPRECATION")
-interface KotlinMultiplatformCommonOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
-}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsBase.kt

@@ -1,57 +0,0 @@
-// DO NOT EDIT MANUALLY!
-// Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
-package org.jetbrains.kotlin.gradle.dsl
-
-@Suppress("DEPRECATION")
-internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptions {
-
-    private var allWarningsAsErrorsField: kotlin.Boolean? = null
-    override var allWarningsAsErrors: kotlin.Boolean
-        get() = allWarningsAsErrorsField ?: false
-        set(value) {
-            allWarningsAsErrorsField = value
-        }
-
-    private var suppressWarningsField: kotlin.Boolean? = null
-    override var suppressWarnings: kotlin.Boolean
-        get() = suppressWarningsField ?: false
-        set(value) {
-            suppressWarningsField = value
-        }
-
-    private var verboseField: kotlin.Boolean? = null
-    override var verbose: kotlin.Boolean
-        get() = verboseField ?: false
-        set(value) {
-            verboseField = value
-        }
-
-    override var apiVersion: kotlin.String? = null
-
-    override var languageVersion: kotlin.String? = null
-
-    private var useK2Field: kotlin.Boolean? = null
-    override var useK2: kotlin.Boolean
-        get() = useK2Field ?: false
-        set(value) {
-            useK2Field = value
-        }
-
-    internal open fun updateArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments) {
-        allWarningsAsErrorsField?.let { args.allWarningsAsErrors = it }
-        suppressWarningsField?.let { args.suppressWarnings = it }
-        verboseField?.let { args.verbose = it }
-        apiVersion?.let { args.apiVersion = it }
-        languageVersion?.let { args.languageVersion = it }
-        useK2Field?.let { args.useK2 = it }
-    }
-}
-
-internal fun org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments.fillDefaultValues() {
-    allWarningsAsErrors = false
-    suppressWarnings = false
-    verbose = false
-    apiVersion = null
-    languageVersion = null
-    useK2 = false
-}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsImpl.kt

@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.gradle.dsl
-
-import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
-
-internal class KotlinMultiplatformCommonOptionsImpl : KotlinMultiplatformCommonOptionsBase() {
-    override var freeCompilerArgs: List<String> = listOf()
-
-    override fun updateArguments(args: K2MetadataCompilerArguments) {
-        super.updateArguments(args)
-        copyFreeCompilerArgsToArgs(args)
-    }
-}