Switch -jvm-target default to null

This commit is contained in:
Mikhael Bogdanov
2021-11-14 14:23:55 +01:00
committed by Space
parent 6379ed22d1
commit f5da166d7c
9 changed files with 20 additions and 19 deletions
@@ -36,7 +36,7 @@ open class DefaultValues(val defaultValue: String, val possibleValues: List<Stri
)
object JvmTargetVersions : DefaultValues(
"\"" + JvmTarget.DEFAULT.description + "\"",
"null",
JvmTarget.values().map { "\"${it.description}\"" }
)
@@ -89,7 +89,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
valueDescription = "<version>",
description = "Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, 11, 12, 13, 14, 15, 16 or 17), default is 1.8"
)
var jvmTarget: String? by NullableStringFreezableVar(JvmTarget.DEFAULT.description)
var jvmTarget: String? by NullableStringFreezableVar(null)
@GradleOption(DefaultValues.BooleanFalseDefault::class)
@Argument(value = "-java-parameters", description = "Generate metadata for Java 1.8 reflection on method parameters")
@@ -76,6 +76,11 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
}
}
if (get(JVMConfigurationKeys.JVM_TARGET) == null) {
put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.JVM_1_8)
}
val jvmTarget = get(JVMConfigurationKeys.JVM_TARGET) ?: JvmTarget.DEFAULT
if (jvmTarget.majorVersion < JvmTarget.JVM_1_8.majorVersion) {
val jvmDefaultMode = languageVersionSettings.getFlag(JvmAnalysisFlags.jvmDefaultMode)