From c3b0ede82b925517e4c4859388ae4c7129d29a0d Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Fri, 28 Sep 2018 23:32:30 +0300
Subject: Remove concept of 'Plus' versions

---
 core/src/main/kotlin/Formats/StructuredFormatService.kt | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'core')

diff --git a/core/src/main/kotlin/Formats/StructuredFormatService.kt b/core/src/main/kotlin/Formats/StructuredFormatService.kt
index dabc0b2b..fffa9e3e 100644
--- a/core/src/main/kotlin/Formats/StructuredFormatService.kt
+++ b/core/src/main/kotlin/Formats/StructuredFormatService.kt
@@ -921,16 +921,7 @@ fun effectivePlatformsForMembers(nodes: Collection<DocumentationNode>): Set<Stri
 }
 
 fun mergeVersions(kotlinVersions: List<String>): String {
-    val allKotlinVersions = kotlinVersions.distinct()
-
-    val minVersion = allKotlinVersions.min()!!
-    val resultVersion: String = when {
-        allKotlinVersions.size == 1 -> allKotlinVersions.single()
-        minVersion.endsWith("+") -> minVersion
-        else -> "$minVersion+"
-    }
-
-    return resultVersion
+    return kotlinVersions.distinct().min()!!
 }
 
 fun effectiveSinceKotlinForNode(node: DocumentationNode, baseVersion: String = "1.0"): String {
-- 
cgit