From 13b07e71e83ee7d2be9e98411d6c14a9fc68e319 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 26 Jul 2019 16:32:43 +0200 Subject: [PATCH] Set AnalysisFlags.explicitApiVersion in tests with API_VERSION directive To mimic the case of user passing an explicit "-api-version" flag to avoid API version being inferred to the version of stdlib in dependencies by JvmRuntimeVersionsConsistencyChecker --- .../kotlin/checkers/CompilerTestLanguageVersionSettings.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt index 01386e08a79..67cd8ee5f02 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt @@ -68,7 +68,8 @@ fun parseLanguageVersionSettings(directives: Map): CompilerTestL analysisFlag(JvmAnalysisFlags.sanitizeParentheses, if (SANITIZE_PARENTHESES in directives) true else null), analysisFlag(AnalysisFlags.constraintSystemForOverloadResolution, directives[CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION]?.let { ConstraintSystemForOverloadResolutionMode.valueOf(it) - }) + }), + analysisFlag(AnalysisFlags.explicitApiVersion, if (apiVersionString != null) true else null) ) if (apiVersionString == null && languageFeaturesString == null && analysisFlags.isEmpty()) {