diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt index e1fef8554cc..656aaba33be 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt @@ -712,29 +712,6 @@ private fun Printer.generateCompilerOptionsHelper( } println("}") - println() - println("internal fun fillDefaultValues(") - withIndent { - println("args: $argsType,") - } - println(") {") - withIndent { - if (parentHelperName != null) println("$parentHelperName.fillDefaultValues(args)") - properties - .filter { it.name != "freeCompilerArgs" } - .forEach { - val defaultValue = it.gradleValues - var value = defaultValue.defaultValue - if (value != "null" && defaultValue.toArgumentConverter != null) { - value = "$value${defaultValue.toArgumentConverter.substringAfter("this")}" - } - println("args.${it.name} = $value") - } - - addAdditionalJvmArgs(helperName) - } - println("}") - println() println("internal fun syncOptionsAsConvention(") withIndent { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptionsHelper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptionsHelper.kt index 24058ae2dc1..1ddcd741204 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptionsHelper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptionsHelper.kt @@ -19,17 +19,6 @@ internal object KotlinCommonCompilerOptionsHelper { 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().toTypedArray() - args.progressiveMode = false - args.useK2 = false - } - internal fun syncOptionsAsConvention( from: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions, into: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptionsHelper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptionsHelper.kt index 277c2212369..e21697cb965 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptionsHelper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptionsHelper.kt @@ -17,14 +17,6 @@ internal object KotlinCommonCompilerToolOptionsHelper { 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 - } - internal fun syncOptionsAsConvention( from: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions, into: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptionsHelper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptionsHelper.kt index 460cb513ba1..538516514c2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptionsHelper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptionsHelper.kt @@ -28,26 +28,6 @@ internal object KotlinJsCompilerOptionsHelper { 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 - } - internal fun syncOptionsAsConvention( from: org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions, into: org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptionsHelper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptionsHelper.kt index dc364fb38df..e359cf08978 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptionsHelper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptionsHelper.kt @@ -16,14 +16,6 @@ internal object KotlinJsDceCompilerToolOptionsHelper { 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 - } - internal fun syncOptionsAsConvention( from: org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions, into: org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt index c4441195662..a02eb9d0a2a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt @@ -23,21 +23,6 @@ internal object KotlinJvmCompilerOptionsHelper { args.allowNoSourceFiles = 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 = org.jetbrains.kotlin.gradle.dsl.JvmTarget.DEFAULT.target - args.moduleName = null - args.noJdk = false - - // Arguments with always default values when used from build tools - args.noStdlib = true - args.noReflect = true - args.allowNoSourceFiles = true - } - internal fun syncOptionsAsConvention( from: org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions, into: org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptionsHelper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptionsHelper.kt index 14f96610959..46c76c8dd34 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptionsHelper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptionsHelper.kt @@ -14,12 +14,6 @@ internal object KotlinMultiplatformCommonCompilerOptionsHelper { 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) - } - internal fun syncOptionsAsConvention( from: org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonCompilerOptions, into: org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonCompilerOptions, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeCompilerOptionsHelper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeCompilerOptionsHelper.kt index dca8c5114a6..710f6d6230a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeCompilerOptionsHelper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeCompilerOptionsHelper.kt @@ -15,13 +15,6 @@ internal object KotlinNativeCompilerOptionsHelper { 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 - } - internal fun syncOptionsAsConvention( from: org.jetbrains.kotlin.gradle.dsl.KotlinNativeCompilerOptions, into: org.jetbrains.kotlin.gradle.dsl.KotlinNativeCompilerOptions,