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) {