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

JVM: support -Xjdk-release=7/1.7

Browse Source 
#KT-59098 Fixed
This commit is contained in:
Alexander Udalov
2024-02-14 14:20:31 +01:00
committed by Space Team
parent 12f393791b
commit 90ff8f0e64
6 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
+3 -2
View File
@@ -31,6 +31,7 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
val value =
when (releaseTargetArg) {
"1.6" -> 6
"1.7" -> 7
"1.8" -> 8
else -> releaseTargetArg.toIntOrNull()
}
@@ -52,7 +53,7 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
}
val jvmTargetValue = when (releaseTargetArg) {
"6", "1.6" -> {
"6", "1.6", "7", "1.7" -> {
if (jvmTargetArg == null) {
messageCollector.report(
ERROR,
@@ -113,7 +114,7 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
private fun isCompatibleJvmTargetAndRelease(jvmTarget: String, release: String): Boolean {
if (jvmTarget == "1.8") {
// This is needed to be able to compile stdlib with -jvm-target 1.8 and -Xjdk-release=1.6/1.7.
return release in listOf("6", "1.6", "8", "1.8")
return release in listOf("6", "1.6", "7", "1.7", "8", "1.8")
}
return jvmTarget == release