From 0689d74353640097559cd16eadf38cb1b343b634 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Thu, 23 Dec 2021 10:28:05 +0300 Subject: [PATCH] [Compiler CLI] Use `LanguageVersion.LATEST_STABLE` instead of `KotlinVersion.CURRENT` for java type enhancement settings to prevent dependency on kotlin version. --- .../cli/common/arguments/JavaTypeEnhancementStateParser.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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..fc0a8ac9f1f 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 @@ -18,6 +18,8 @@ package org.jetbrains.kotlin.cli.common.arguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.config.LanguageVersion +import org.jetbrains.kotlin.config.toKotlinVersion import org.jetbrains.kotlin.load.java.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.isSubpackageOf @@ -202,7 +204,7 @@ class JavaTypeEnhancementStateParser( } companion object { - private val DEFAULT = JavaTypeEnhancementStateParser(MessageCollector.NONE, KotlinVersion.CURRENT) + private val DEFAULT = JavaTypeEnhancementStateParser(MessageCollector.NONE, LanguageVersion.LATEST_STABLE.toKotlinVersion()) private const val NULLABILITY_ANNOTATIONS_COMPILER_OPTION = "-Xnullability-annotations" fun parsePlainNullabilityAnnotationReportLevels(nullabilityAnnotations: String): Pair =