Move skipMetadataVersionCheck flag to LanguageVersionSettings
This makes it possible to avoid the CompilerConfiguration instance in injectors, because CompilerDeserializationConfiguration was the only left component that required it. LanguageVersionSettings is not a good name for this entity anymore, it should be renamed in the future
This commit is contained in:
@@ -233,8 +233,6 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
|
||||
configuration.put(CLIConfigurationKeys.COMPILER_JAR_LOCATOR, locator);
|
||||
}
|
||||
|
||||
configuration.put(CommonConfigurationKeys.SKIP_METADATA_VERSION_CHECK, arguments.skipMetadataVersionCheck);
|
||||
|
||||
setupLanguageVersionSettings(configuration, arguments);
|
||||
}
|
||||
|
||||
@@ -281,6 +279,7 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
|
||||
new LanguageVersionSettingsImpl(
|
||||
languageVersion,
|
||||
ApiVersion.createByLanguageVersion(apiVersion),
|
||||
arguments.skipMetadataVersionCheck,
|
||||
extraLanguageFeatures,
|
||||
arguments.apiVersion != null
|
||||
)
|
||||
|
||||
@@ -130,6 +130,7 @@ object JvmRuntimeVersionsConsistencyChecker {
|
||||
val newSettings = LanguageVersionSettingsImpl(
|
||||
languageVersionSettings.languageVersion,
|
||||
inferredApiVersion,
|
||||
languageVersionSettings.skipMetadataVersionCheck,
|
||||
languageVersionSettings.additionalFeatures,
|
||||
isApiVersionExplicit = false
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user