From 29f174f074d7dbab93988f2c30bf2609e522ff91 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Mon, 27 Dec 2021 15:56:59 +0300 Subject: [PATCH] Revert "Revert "Temporary workaround for failing tests on teamcity."" This reverts commit 2c51799e0a824aeac1d5625a9e15cfa1c01e0965. --- .../cli/common/arguments/JavaTypeEnhancementStateParser.kt | 2 +- .../kotlin/load/java/JavaNullabilityAnnotationSettings.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt index e429e7cd7fe..34c3cbe98a6 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt @@ -202,7 +202,7 @@ class JavaTypeEnhancementStateParser( } companion object { - private val DEFAULT = JavaTypeEnhancementStateParser(MessageCollector.NONE, KotlinVersion.CURRENT) + private val DEFAULT = JavaTypeEnhancementStateParser(MessageCollector.NONE, KotlinVersion(1, 6, 20)) private const val NULLABILITY_ANNOTATIONS_COMPILER_OPTION = "-Xnullability-annotations" fun parsePlainNullabilityAnnotationReportLevels(nullabilityAnnotations: String): Pair = diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt index c192fc4b9b9..e8d4d434484 100644 --- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt +++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt @@ -72,7 +72,7 @@ fun getDefaultReportLevelForAnnotation(annotationFqName: FqName) = fun getReportLevelForAnnotation( annotation: FqName, configuredReportLevels: NullabilityAnnotationStates, - configuredKotlinVersion: KotlinVersion = KotlinVersion.CURRENT + configuredKotlinVersion: KotlinVersion = KotlinVersion(1, 6, 20) ): ReportLevel { configuredReportLevels[annotation]?.let { return it }