azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configuration: Do not auto-advance "Latest Stable" to pre-release version

Browse Source 
#KT-25611 Fixed

Original commit: 5ac5a8d723
This commit is contained in:
Alexey Sedunov
2018-07-26 18:01:42 +03:00
committed by Ilya Gorbunov
parent b48d055334
commit 63372baea9
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+10 -1
View File
@@ -74,7 +74,7 @@ sealed class VersionView : DescriptionAware {
abstract val version: LanguageVersion abstract val version: LanguageVersion
object LatestStable : VersionView() { object LatestStable : VersionView() {
override val version: LanguageVersion = LanguageVersion.LATEST_STABLE override val version: LanguageVersion = RELEASED_VERSION
override val description: String override val description: String
get() = "Latest stable (${version.versionString})" get() = "Latest stable (${version.versionString})"
@@ -90,6 +90,15 @@ sealed class VersionView : DescriptionAware {
} }
companion object { companion object {
val RELEASED_VERSION by lazy {
val latestStable = LanguageVersion.LATEST_STABLE
if (latestStable.isPreRelease()) {
val versions = LanguageVersion.values()
val index = versions.indexOf(latestStable)
versions.getOrNull(index - 1) ?: LanguageVersion.KOTLIN_1_0
} else latestStable
}
fun deserialize(value: String?, isAutoAdvance: Boolean): VersionView { fun deserialize(value: String?, isAutoAdvance: Boolean): VersionView {
if (isAutoAdvance) return VersionView.LatestStable if (isAutoAdvance) return VersionView.LatestStable
val languageVersion = LanguageVersion.fromVersionString(value) val languageVersion = LanguageVersion.fromVersionString(value)