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

Rename 'RELEASE' fields into 'JDK_RELEASE'

Browse Source
This commit is contained in:
Mikhael Bogdanov
2021-11-16 10:09:44 +01:00
committed by Space
parent b8ca22da87
commit 3593e45b97
35 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+1 -1
View File
@@ -239,7 +239,7 @@ class KotlinCoreEnvironment private constructor(
val javaFileManager = ServiceManager.getService(project, CoreJavaFileManager::class.java) as KotlinCliJavaFileManagerImpl
val jdkHome = configuration.get(JVMConfigurationKeys.JDK_HOME)
val releaseTarget = configuration.get(JVMConfigurationKeys.RELEASE, 0)
val releaseTarget = configuration.get(JVMConfigurationKeys.JDK_RELEASE, 0)
val javaModuleFinder = CliJavaModuleFinder(
jdkHome,
messageCollector,
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
+2 -2
View File
@@ -45,7 +45,7 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
} else {
//don't use release flag if it equals to compilation JDK version
if (value != getJavaVersion() || arguments.jdkHome != null) {
put(JVMConfigurationKeys.RELEASE, value)
put(JVMConfigurationKeys.JDK_RELEASE, value)
}
if (jvmTargetArg != null && jvmTargetArg != releaseTargetArg) {
messageCollector.report(
@@ -185,7 +185,7 @@ fun CompilerConfiguration.configureExplicitContentRoots(arguments: K2JVMCompiler
}
fun CompilerConfiguration.configureStandardLibs(paths: KotlinPaths?, arguments: K2JVMCompilerArguments) {
val releaseFlagValue = this.get(JVMConfigurationKeys.RELEASE, 0)
val releaseFlagValue = this.get(JVMConfigurationKeys.JDK_RELEASE, 0)
val isModularJava = isModularJava() && (releaseFlagValue <= 0 || releaseFlagValue >= 9)
fun addRoot(moduleName: String, libraryName: String, getLibrary: (KotlinPaths) -> File, noLibraryArgument: String) {
compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class JVMConfigurationKeys {
public static final CompilerConfigurationKey<JvmStringConcat> STRING_CONCAT =
CompilerConfigurationKey.create("Specifies string concatenation scheme");
public static final CompilerConfigurationKey<Integer> RELEASE =
public static final CompilerConfigurationKey<Integer> JDK_RELEASE =
CompilerConfigurationKey.create("Specifies JDK API version");
public static final CompilerConfigurationKey<JvmClosureGenerationScheme> SAM_CONVERSIONS =
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt
+1 -1
View File
@@ -59,7 +59,7 @@ object LanguageSettingsDirectives : SimpleDirectivesContainer() {
additionalParser = JvmDefaultMode.Companion::fromStringOrNull
)
val RELEASE by valueDirective(
val JDK_RELEASE by valueDirective(
description = "Configures corresponding release flag",
parser = Integer::valueOf
)
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_10.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 10
// JDK_RELEASE: 10
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_11.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 11
// JDK_RELEASE: 11
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_6.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 6
// JDK_RELEASE: 6
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/Buffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/Buffer;
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_8.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 8
// JDK_RELEASE: 8
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/Buffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/Buffer;
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_9.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 9
// JDK_RELEASE: 9
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_10.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 10
// JDK_RELEASE: 10
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/ReflectiveOperationException
// 1 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException;
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_11.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 11
// JDK_RELEASE: 11
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/ReflectiveOperationException
// 1 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException;
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_6.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 6
// JDK_RELEASE: 6
// CHECK_BYTECODE_TEXT
// 0 CHECKCAST java/lang/ReflectiveOperationException
// 0 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException;
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_8.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 8
// JDK_RELEASE: 8
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/ReflectiveOperationException
// 1 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException;
compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_9.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 9
// JDK_RELEASE: 9
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/ReflectiveOperationException
// 1 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_10.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 10
// JDK_RELEASE: 10
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_11.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 11
// JDK_RELEASE: 11
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_12.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 12
// JDK_RELEASE: 12
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_13.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 13
// JDK_RELEASE: 13
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_14.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 14
// JDK_RELEASE: 14
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_15.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 15
// JDK_RELEASE: 15
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_16.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 16
// JDK_RELEASE: 16
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_17.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 17
// JDK_RELEASE: 17
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_8.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 8
// JDK_RELEASE: 8
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/Buffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/Buffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_9.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 9
// JDK_RELEASE: 9
// CHECK_BYTECODE_TEXT
// 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer;
// 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_10.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 10
// JDK_RELEASE: 10
// CHECK_BYTECODE_TEXT
// 0 CHECKCAST java/lang/constant/Constable
// 0 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_11.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 11
// JDK_RELEASE: 11
// CHECK_BYTECODE_TEXT
// 0 CHECKCAST java/lang/constant/Constable
// 0 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_12.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 12
// JDK_RELEASE: 12
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/constant/Constable
// 1 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_13.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 13
// JDK_RELEASE: 13
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/constant/Constable
// 1 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_14.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 14
// JDK_RELEASE: 14
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/constant/Constable
// 1 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_15.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 15
// JDK_RELEASE: 15
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/constant/Constable
// 1 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_16.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 16
// JDK_RELEASE: 16
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/constant/Constable
// 1 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_17.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 17
// JDK_RELEASE: 17
// CHECK_BYTECODE_TEXT
// 2 CHECKCAST java/lang/constant/Constable
// 1 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_8.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 8
// JDK_RELEASE: 8
// CHECK_BYTECODE_TEXT
// 0 CHECKCAST java/lang/constant/Constable
// 0 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_9.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// RELEASE: 9
// JDK_RELEASE: 9
// CHECK_BYTECODE_TEXT
// 0 CHECKCAST java/lang/constant/Constable
// 0 LOCALVARIABLE constable Ljava/lang/constant/Constable;
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
+2 -2
View File
@@ -47,7 +47,7 @@ import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.ENABLE_JV
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_OPTIMIZED_CALLABLE_REFERENCES
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_UNIFIED_NULL_CHECKS
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.PARAMETERS_METADATA
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.RELEASE
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.JDK_RELEASE
import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
import org.jetbrains.kotlin.test.model.DependencyDescription
@@ -146,7 +146,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
register(PARAMETERS_METADATA, JVMConfigurationKeys.PARAMETERS_METADATA)
register(JVM_TARGET, JVMConfigurationKeys.JVM_TARGET)
register(SERIALIZE_IR, JVMConfigurationKeys.SERIALIZE_IR)
register(RELEASE, JVMConfigurationKeys.RELEASE)
register(JDK_RELEASE, JVMConfigurationKeys.JDK_RELEASE)
}
@OptIn(ExperimentalPathApi::class, ExperimentalStdlibApi::class)