Split compiler options implementation and helper methods

Such split allows to reuse default implementation for different
use-cases. Helpers, in this case, allows to do manipulations with
options where required.

^KT-57159 In Progress

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

@@ -24,22 +24,4 @@ internal abstract class KotlinCommonCompilerOptionsDefault @javax.inject.Inject
     @Deprecated(message = "Compiler flag -Xuse-k2 is deprecated; please use language version 2.0 instead", level = DeprecationLevel.WARNING)
     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.optIn = optIn.get().toTypedArray()
-        args.progressiveMode = progressiveMode.get()
-        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.optIn = emptyList<String>().toTypedArray()
-        args.progressiveMode = false
-        args.useK2 = false
-    }
 }

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

@@ -0,0 +1,32 @@
+// 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 object KotlinCommonCompilerOptionsHelper {
+
+    internal fun fillCompilerArguments(
+        from: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions,
+        args: org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptionsHelper.fillCompilerArguments(from, args)
+        args.apiVersion = from.apiVersion.orNull?.version
+        args.languageVersion = from.languageVersion.orNull?.version
+        args.optIn = from.optIn.get().toTypedArray()
+        args.progressiveMode = from.progressiveMode.get()
+        args.useK2 = from.useK2.get()
+    }
+
+    internal fun fillDefaultValues(
+        args: org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptionsHelper.fillDefaultValues(args)
+        args.apiVersion = null
+        args.languageVersion = null
+        args.optIn = emptyList<String>().toTypedArray()
+        args.progressiveMode = false
+        args.useK2 = false
+    }
+}

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

@@ -20,17 +20,4 @@ internal abstract class KotlinCommonCompilerToolOptionsDefault @javax.inject.Inj
 
     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/KotlinCommonCompilerToolOptionsHelper.kt

@@ -0,0 +1,27 @@
+// 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 object KotlinCommonCompilerToolOptionsHelper {
+
+    internal fun fillCompilerArguments(
+        from: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions,
+        args: org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments,
+    ) {
+        args.allWarningsAsErrors = from.allWarningsAsErrors.get()
+        args.suppressWarnings = from.suppressWarnings.get()
+        args.verbose = from.verbose.get()
+        args.freeArgs += from.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/KotlinJsCompilerOptionsDefault.kt

@@ -51,40 +51,4 @@ internal abstract class KotlinJsCompilerOptionsDefault @javax.inject.Inject cons
 
     override val useEsClasses: 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.K2JSCompilerArguments) {
-        super.fillCompilerArguments(args)
-        args.friendModulesDisabled = friendModulesDisabled.get()
-        args.main = main.get().mode
-        args.metaInfo = metaInfo.get()
-        args.moduleKind = moduleKind.get().kind
-        args.moduleName = moduleName.orNull
-        args.noStdlib = noStdlib.get()
-        args.outputFile = outputFile.orNull
-        args.sourceMap = sourceMap.get()
-        args.sourceMapEmbedSources = sourceMapEmbedSources.orNull?.mode
-        args.sourceMapNamesPolicy = sourceMapNamesPolicy.orNull?.policy
-        args.sourceMapPrefix = sourceMapPrefix.orNull
-        args.target = target.get()
-        args.typedArrays = typedArrays.get()
-        args.useEsClasses = useEsClasses.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.moduleName = null
-        args.noStdlib = true
-        args.outputFile = null
-        args.sourceMap = false
-        args.sourceMapEmbedSources = null
-        args.sourceMapNamesPolicy = null
-        args.sourceMapPrefix = null
-        args.target = "v5"
-        args.typedArrays = true
-        args.useEsClasses = false
-    }
 }

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

@@ -0,0 +1,50 @@
+// 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 object KotlinJsCompilerOptionsHelper {
+
+    internal fun fillCompilerArguments(
+        from: org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions,
+        args: org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsHelper.fillCompilerArguments(from, args)
+        args.friendModulesDisabled = from.friendModulesDisabled.get()
+        args.main = from.main.get().mode
+        args.metaInfo = from.metaInfo.get()
+        args.moduleKind = from.moduleKind.get().kind
+        args.moduleName = from.moduleName.orNull
+        args.noStdlib = from.noStdlib.get()
+        args.outputFile = from.outputFile.orNull
+        args.sourceMap = from.sourceMap.get()
+        args.sourceMapEmbedSources = from.sourceMapEmbedSources.orNull?.mode
+        args.sourceMapNamesPolicy = from.sourceMapNamesPolicy.orNull?.policy
+        args.sourceMapPrefix = from.sourceMapPrefix.orNull
+        args.target = from.target.get()
+        args.typedArrays = from.typedArrays.get()
+        args.useEsClasses = from.useEsClasses.get()
+    }
+
+    internal fun fillDefaultValues(
+        args: org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsHelper.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.moduleName = null
+        args.noStdlib = true
+        args.outputFile = null
+        args.sourceMap = false
+        args.sourceMapEmbedSources = null
+        args.sourceMapNamesPolicy = null
+        args.sourceMapPrefix = null
+        args.target = "v5"
+        args.typedArrays = true
+        args.useEsClasses = false
+    }
+}

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

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.gradle.dsl
 
 internal abstract class KotlinJsDceCompilerToolOptionsDefault @javax.inject.Inject constructor(
     objectFactory: org.gradle.api.model.ObjectFactory
-) : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions {
+) : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions {
 
     override val devMode: org.gradle.api.provider.Property<kotlin.Boolean> =
         objectFactory.property(kotlin.Boolean::class.java).convention(false)
@@ -15,16 +15,4 @@ internal abstract class KotlinJsDceCompilerToolOptionsDefault @javax.inject.Inje
     @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/KotlinJsDceCompilerToolOptionsHelper.kt

@@ -0,0 +1,26 @@
+// 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 object KotlinJsDceCompilerToolOptionsHelper {
+
+    internal fun fillCompilerArguments(
+        from: org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions,
+        args: org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptionsHelper.fillCompilerArguments(from, args)
+        args.devMode = from.devMode.get()
+        args.outputDirectory = from.outputDirectory.orNull
+    }
+
+    internal fun fillDefaultValues(
+        args: org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptionsHelper.fillDefaultValues(args)
+        args.devMode = false
+        args.outputDirectory = null
+    }
+}

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

@@ -20,28 +20,4 @@ internal abstract class KotlinJvmCompilerOptionsDefault @javax.inject.Inject con
 
     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/KotlinJvmCompilerOptionsHelper.kt

@@ -0,0 +1,38 @@
+// 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 object KotlinJvmCompilerOptionsHelper {
+
+    internal fun fillCompilerArguments(
+        from: org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions,
+        args: org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsHelper.fillCompilerArguments(from, args)
+        args.javaParameters = from.javaParameters.get()
+        args.jvmTarget = from.jvmTarget.orNull?.target
+        args.moduleName = from.moduleName.orNull
+        args.noJdk = from.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,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsHelper.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/KotlinMultiplatformCommonCompilerOptionsDefault.kt

@@ -8,12 +8,4 @@ package org.jetbrains.kotlin.gradle.dsl
 internal abstract class KotlinMultiplatformCommonCompilerOptionsDefault @javax.inject.Inject constructor(
     objectFactory: org.gradle.api.model.ObjectFactory
 ) : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonCompilerOptions {
-
-    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/KotlinMultiplatformCommonCompilerOptionsHelper.kt

@@ -0,0 +1,22 @@
+// 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 object KotlinMultiplatformCommonCompilerOptionsHelper {
+
+    internal fun fillCompilerArguments(
+        from: org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonCompilerOptions,
+        args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsHelper.fillCompilerArguments(from, args)
+    }
+
+    internal fun fillDefaultValues(
+        args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsHelper.fillDefaultValues(args)
+    }
+}

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

@@ -11,14 +11,4 @@ internal abstract class KotlinNativeCompilerOptionsDefault @javax.inject.Inject
 
     override val moduleName: org.gradle.api.provider.Property<kotlin.String> =
         objectFactory.property(kotlin.String::class.java)
-
-    internal fun fillCompilerArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2NativeCompilerArguments) {
-        super.fillCompilerArguments(args)
-        args.moduleName = moduleName.orNull
-    }
-
-    internal fun fillDefaultValues(args: org.jetbrains.kotlin.cli.common.arguments.K2NativeCompilerArguments) {
-        super.fillDefaultValues(args)
-        args.moduleName = null
-    }
 }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeCompilerOptionsHelper.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
+
+internal object KotlinNativeCompilerOptionsHelper {
+
+    internal fun fillCompilerArguments(
+        from: org.jetbrains.kotlin.gradle.dsl.KotlinNativeCompilerOptions,
+        args: org.jetbrains.kotlin.cli.common.arguments.K2NativeCompilerArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsHelper.fillCompilerArguments(from, args)
+        args.moduleName = from.moduleName.orNull
+    }
+
+    internal fun fillDefaultValues(
+        args: org.jetbrains.kotlin.cli.common.arguments.K2NativeCompilerArguments,
+    ) {
+        org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsHelper.fillDefaultValues(args)
+        args.moduleName = null
+    }
+}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.internal
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptionsDefault
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptionsHelper
 import org.jetbrains.kotlin.gradle.logging.kotlinDebug
 import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompileArgumentsProvider
@@ -78,7 +78,7 @@ internal open class KotlinJvmCompilerArgumentsContributor(
         args: K2JVMCompilerArguments,
         flags: Collection<CompilerArgumentsConfigurationFlag>
     ) {
-        (compilerOptions as KotlinJvmCompilerOptionsDefault).fillDefaultValues(args)
+        KotlinJvmCompilerOptionsHelper.fillDefaultValues(args)
 
         super.contributeArguments(args, flags)
 
@@ -98,7 +98,7 @@ internal open class KotlinJvmCompilerArgumentsContributor(
         }
         args.destinationAsFile = destinationDir
 
-        compilerOptions.fillCompilerArguments(args)
+        KotlinJvmCompilerOptionsHelper.fillCompilerArguments(compilerOptions, args)
         logger.kotlinDebug { "$taskName | args.moduleName = ${args.moduleName} (w/ compilerOptions applied)" }
     }
 }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt

@@ -26,6 +26,7 @@ import org.gradle.work.NormalizeLineEndings
 import org.gradle.workers.WorkerExecutor
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptionsDefault
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptionsHelper
 import org.jetbrains.kotlin.gradle.report.BuildReportMode
 import org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -114,7 +115,7 @@ abstract class KaptGenerateStubsTask @Inject constructor(
         args.freeArgs = emptyList()
         // Also use KotlinOptions configuration that was directly set to this task
         // as 'compileKotlinArgumentsContributor' has KotlinOptions from linked KotlinCompile task
-        (compilerOptions as KotlinJvmCompilerOptionsDefault).fillCompilerArguments(args)
+        KotlinJvmCompilerOptionsHelper.fillCompilerArguments(compilerOptions, args)
 
         // Copied from KotlinCompile
         if (reportingSettings().buildReportMode == BuildReportMode.VERBOSE) {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Kotlin2JsCompile.kt

@@ -23,10 +23,8 @@ import org.jetbrains.kotlin.compilerRunner.ArgumentUtils
 import org.jetbrains.kotlin.compilerRunner.GradleCompilerEnvironment
 import org.jetbrains.kotlin.compilerRunner.IncrementalCompilationEnvironment
 import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl
-import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile
-import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.*
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptionsDefault
-import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions
 import org.jetbrains.kotlin.gradle.internal.tasks.allOutputFiles
 import org.jetbrains.kotlin.gradle.logging.GradleErrorMessageCollector
 import org.jetbrains.kotlin.gradle.logging.GradlePrintingMessageCollector
@@ -131,12 +129,12 @@ abstract class Kotlin2JsCompile @Inject constructor(
         K2JSCompilerArguments()
 
     override fun setupCompilerArgs(args: K2JSCompilerArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) {
-        (compilerOptions as KotlinJsCompilerOptionsDefault).fillDefaultValues(args)
+        KotlinJsCompilerOptionsHelper.fillDefaultValues(args)
         super.setupCompilerArgs(args, defaultsOnly = defaultsOnly, ignoreClasspathResolutionErrors = ignoreClasspathResolutionErrors)
 
         if (defaultsOnly) return
 
-        (compilerOptions as KotlinJsCompilerOptionsDefault).fillCompilerArguments(args)
+        KotlinJsCompilerOptionsHelper.fillCompilerArguments(compilerOptions, args)
         if (!args.sourceMapPrefix.isNullOrEmpty()) {
             args.sourceMapBaseDirs = sourceMapBaseDir.get().asFile.absolutePath
         }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt

@@ -65,7 +65,7 @@ abstract class KotlinCompileCommon @Inject constructor(
         K2MetadataCompilerArguments()
 
     override fun setupCompilerArgs(args: K2MetadataCompilerArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) {
-        (compilerOptions as KotlinMultiplatformCommonCompilerOptionsDefault).fillDefaultValues(args)
+        KotlinMultiplatformCommonCompilerOptionsHelper.fillDefaultValues(args)
         super.setupCompilerArgs(args, defaultsOnly = defaultsOnly, ignoreClasspathResolutionErrors = ignoreClasspathResolutionErrors)
 
         args.moduleName = this@KotlinCompileCommon.moduleName.get()
@@ -86,7 +86,7 @@ abstract class KotlinCompileCommon @Inject constructor(
             refinesPaths = refinesMetadataPaths.map { it.absolutePath }.toTypedArray()
         }
 
-        (compilerOptions as KotlinMultiplatformCommonCompilerOptionsDefault).fillCompilerArguments(args)
+        KotlinMultiplatformCommonCompilerOptionsHelper.fillCompilerArguments(compilerOptions, args)
 
         val localExecutionTimeFreeCompilerArgs = executionTimeFreeCompilerArgs
         if (localExecutionTimeFreeCompilerArgs != null) {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt

@@ -28,10 +28,9 @@ import org.jetbrains.kotlin.cli.common.arguments.DevModeOverwritingStrategies
 import org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments
 import org.jetbrains.kotlin.cli.js.dce.K2JSDce
 import org.jetbrains.kotlin.compilerRunner.runToolInSeparateProcess
-import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions
-import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptionsDefault
+import org.jetbrains.kotlin.gradle.dsl.*
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce
-import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptionsDefault
 import org.jetbrains.kotlin.gradle.logging.GradleKotlinLogger
 import org.jetbrains.kotlin.gradle.utils.absolutePathWithoutExtension
 import org.jetbrains.kotlin.gradle.utils.fileExtensionCasePermutations
@@ -58,7 +57,7 @@ abstract class KotlinJsDce @Inject constructor(
     override fun createCompilerArgs(): K2JSDceArguments = K2JSDceArguments()
 
     override fun setupCompilerArgs(args: K2JSDceArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) {
-        (toolOptions as KotlinJsDceCompilerToolOptionsDefault).fillCompilerArguments(args)
+        KotlinJsDceCompilerToolOptionsHelper.fillCompilerArguments(toolOptions, args)
         args.declarationsToKeep = keep.toTypedArray()
     }