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

Minor, fix debug info when inferring API version

Browse Source
This commit is contained in:
Alexander Udalov
2019-07-26 16:09:27 +02:00
parent d0385e4e7c
commit 9456763576
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt
+2 -4
View File
@@ -136,17 +136,15 @@ object JvmRuntimeVersionsConsistencyChecker {
// we infer API = the version of that stdlib. // we infer API = the version of that stdlib.
// Note that "no explicit -api-version" requirement is necessary because for example, in // Note that "no explicit -api-version" requirement is necessary because for example, in
// "kotlinc-1.2 -language-version 1.0 -cp kotlin-runtime-1.1.jar" we should still infer API = 1.0 // "kotlinc-1.2 -language-version 1.0 -cp kotlin-runtime-1.1.jar" we should still infer API = 1.0
val newSettings = object : LanguageVersionSettings by languageVersionSettings { configuration.languageVersionSettings = object : LanguageVersionSettings by languageVersionSettings {
override val apiVersion: ApiVersion get() = actualApi override val apiVersion: ApiVersion get() = actualApi
} }
messageCollector.issue( messageCollector.issue(
null, "Old runtime has been found in the classpath. " + null, "Old runtime has been found in the classpath. " +
"Initial language version settings: $languageVersionSettings. " + "Initial language version settings: $languageVersionSettings. " +
"Updated language version settings: $newSettings", CompilerMessageSeverity.LOGGING "Updated API version: $actualApi", CompilerMessageSeverity.LOGGING
) )
configuration.languageVersionSettings = newSettings
} }
} else if (consistency != ClasspathConsistency.Consistent) { } else if (consistency != ClasspathConsistency.Consistent) {
messageCollector.issue( messageCollector.issue(