From b252897a01a9f81a8abbb7be78745a97e6aca86c Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Mon, 1 Nov 2021 15:20:08 +0100 Subject: [PATCH] [CHERRY PICKED FROM IJ] [cleanup] Inline VersionView.RELEASED_VERSION The variable is redundant GitOrigin-RevId: 99e0e06f8eda6410c41a67b88db50d4d8b5f52ca Original commit: https://github.com/JetBrains/intellij-community/commit/8b09416812def39f15cdcd7e836129ca6ccc2094 --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 4 +--- .../src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index b340492b3f9..cedcffa36d9 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -51,7 +51,7 @@ sealed class VersionView : DescriptionAware { abstract val version: LanguageVersion object LatestStable : VersionView() { - override val version: LanguageVersion = RELEASED_VERSION + override val version: LanguageVersion = LanguageVersion.LATEST_STABLE override val description: String get() = "Latest stable (${version.versionString})" @@ -67,8 +67,6 @@ sealed class VersionView : DescriptionAware { } companion object { - val RELEASED_VERSION = LanguageVersion.LATEST_STABLE - fun deserialize(value: String?, isAutoAdvance: Boolean): VersionView { if (isAutoAdvance) return LatestStable val languageVersion = LanguageVersion.fromVersionString(value) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt index a649372de04..bfea0d372ec 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt @@ -43,7 +43,7 @@ class KotlinChunk internal constructor(val context: KotlinCompileContext, val ta val haveSameCompiler = targets.all { it.javaClass == representativeTarget.javaClass } - private val defaultLanguageVersion = VersionView.RELEASED_VERSION + private val defaultLanguageVersion = LanguageVersion.LATEST_STABLE val compilerArguments by lazy { representativeTarget.jpsModuleBuildTarget.module.kotlinCompilerArguments.also {