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

CLI: improve error message for -Xjdk-release=1.6/1.7

Browse Source 
#KT-66174 Fixed
This commit is contained in:
Alexander Udalov
2024-02-27 18:53:04 +01:00
committed by Space Team
parent 5f261d3ad0
commit 939a74add3
5 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
+6 -3
View File
@@ -43,10 +43,12 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
put(JVMConfigurationKeys.JDK_RELEASE, value)
}
if (jvmTargetArg != null && !isCompatibleJvmTargetAndRelease(jvmTargetArg, releaseTargetArg)) {
val suggestion =
if (value < 8) "Please change the value of the 'jvm-target' option to 1.8"
else "Please remove the '-jvm-target' option"
messageCollector.report(
ERROR,
"'-Xjdk-release=$releaseTargetArg' option conflicts with '-jvm-target $jvmTargetArg'. " +
"Please remove the '-jvm-target' option"
"'-Xjdk-release=$releaseTargetArg' option conflicts with '-jvm-target $jvmTargetArg'. $suggestion"
)
}
}
@@ -57,7 +59,8 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
if (jvmTargetArg == null) {
messageCollector.report(
ERROR,
"'-Xjdk-release=$releaseTargetArg' option requires explicit JVM target. Please specify the '-jvm-target' option"
"'-Xjdk-release=$releaseTargetArg' option requires JVM target explicitly set to 1.8. " +
"Please specify the '-jvm-target' option"
)
}
jvmTargetArg