azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] GenerateGradleOptions: Remove fillDefaultValues

Browse Source 
KTIJ-24976
This commit is contained in:
Sebastian Sellmair
2023-04-04 22:07:01 +02:00
committed by Space Team
parent d6cc9e2476
commit 1cebf24bed
8 changed files with 0 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptionsHelper.kt
-11
View File
@@ -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<String>().toTypedArray()
args.progressiveMode = false
args.useK2 = false
}
internal fun syncOptionsAsConvention(
from: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions,
into: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptionsHelper.kt
-8
View File
@@ -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,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptionsHelper.kt
-20
View File
@@ -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,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptionsHelper.kt
-8
View File
@@ -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,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt
-15
View File
@@ -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,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptionsHelper.kt
-6
View File
@@ -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,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinNativeCompilerOptionsHelper.kt
-7
View File
@@ -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,