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

Add JVM target bytecode version 16

Browse Source 
#KT-45515 Fixed
This commit is contained in:
Alexander Udalov
2021-03-16 18:56:04 +01:00
parent 09f9489619
commit 27174de891
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+1 -1
View File
@@ -74,7 +74,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
@Argument( @Argument(
value = "-jvm-target", value = "-jvm-target",
valueDescription = "<version>", valueDescription = "<version>",
description = "Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, 11, 12, 13, 14 or 15), default is 1.8" description = "Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, 11, 12, 13, 14, 15 or 16), default is 1.8"
) )
var jvmTarget: String? by NullableStringFreezableVar(JvmTarget.DEFAULT.description) var jvmTarget: String? by NullableStringFreezableVar(JvmTarget.DEFAULT.description)
compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt
+1
View File
@@ -32,6 +32,7 @@ enum class JvmTarget(
JVM_13("13", Opcodes.V12 + 1), JVM_13("13", Opcodes.V12 + 1),
JVM_14("14", Opcodes.V12 + 2), JVM_14("14", Opcodes.V12 + 2),
JVM_15("15", Opcodes.V12 + 3), JVM_15("15", Opcodes.V12 + 3),
JVM_16("16", Opcodes.V12 + 4),
; ;
companion object { companion object {
compiler/testData/cli/jvm/help.out
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ where possible options include:
-include-runtime Include Kotlin runtime into the resulting JAR -include-runtime Include Kotlin runtime into the resulting JAR
-java-parameters Generate metadata for Java 1.8 reflection on method parameters -java-parameters Generate metadata for Java 1.8 reflection on method parameters
-jdk-home <path> Include a custom JDK from the specified location into the classpath instead of the default JAVA_HOME -jdk-home <path> Include a custom JDK from the specified location into the classpath instead of the default JAVA_HOME
-jvm-target <version> Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, 11, 12, 13, 14 or 15), default is 1.8 -jvm-target <version> Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, 11, 12, 13, 14, 15 or 16), default is 1.8
-module-name <name> Name of the generated .kotlin_module file -module-name <name> Name of the generated .kotlin_module file
-no-jdk Don't automatically include the Java runtime into the classpath -no-jdk Don't automatically include the Java runtime into the classpath
-no-reflect Don't automatically include Kotlin reflection into the classpath -no-reflect Don't automatically include Kotlin reflection into the classpath
compiler/testData/cli/jvm/wrongJvmTargetVersion.out
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
error: unknown JVM target version: 1.5 error: unknown JVM target version: 1.5
Supported versions: 1.6, 1.8, 9, 10, 11, 12, 13, 14, 15 Supported versions: 1.6, 1.8, 9, 10, 11, 12, 13, 14, 15, 16
COMPILATION_ERROR COMPILATION_ERROR
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
+2 -2
View File
@@ -24,8 +24,8 @@ interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOption
var jdkHome: kotlin.String? var jdkHome: kotlin.String?
/** /**
* Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, 11, 12, 13, 14 or 15), default is 1.8 * Target version of the generated JVM bytecode (1.6 (DEPRECATED), 1.8, 9, 10, 11, 12, 13, 14, 15 or 16), default is 1.8
* Possible values: "1.6", "1.8", "9", "10", "11", "12", "13", "14", "15" * Possible values: "1.6", "1.8", "9", "10", "11", "12", "13", "14", "15", "16"
* Default value: "1.8" * Default value: "1.8"
*/ */
var jvmTarget: kotlin.String var jvmTarget: kotlin.String