aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2018-09-28 23:32:30 +0300
committerSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2018-09-28 23:32:30 +0300
commitc3b0ede82b925517e4c4859388ae4c7129d29a0d (patch)
tree42eeb2a8b8e7b4f71092b342e611ac5883134da8
parent45495ebb61964ce853c4f1b5a4b63f28e18daa57 (diff)
downloaddokka-c3b0ede82b925517e4c4859388ae4c7129d29a0d.tar.gz
dokka-c3b0ede82b925517e4c4859388ae4c7129d29a0d.tar.bz2
dokka-c3b0ede82b925517e4c4859388ae4c7129d29a0d.zip
Remove concept of 'Plus' versions
-rw-r--r--core/src/main/kotlin/Formats/StructuredFormatService.kt11
1 files changed, 1 insertions, 10 deletions
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 {