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

Use correct version detection for developer versions

Browse Source 
#KT-11213 Fixed
This commit is contained in:
Nikolay Krasko
2016-04-12 15:40:53 +03:00
parent aff1226e47
commit 441fb7ff28
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
+1 -1
View File
@@ -163,7 +163,7 @@ private enum class LibraryJarDescriptor private constructor(val jarName: String,
JS_STDLIB_SRC_JAR(PathUtil.JS_LIB_SRC_JAR_NAME, false) JS_STDLIB_SRC_JAR(PathUtil.JS_LIB_SRC_JAR_NAME, false)
} }
private val PLUGIN_VERSIONS_SEPARATORS = arrayOf("Idea", "IJ", "release") private val PLUGIN_VERSIONS_SEPARATORS = arrayOf("Idea", "IJ", "release", "dev")
@JvmOverloads fun bundledRuntimeVersion(pluginVersion: String = KotlinPluginUtil.getPluginVersion()): String { @JvmOverloads fun bundledRuntimeVersion(pluginVersion: String = KotlinPluginUtil.getPluginVersion()): String {
var placeToSplit = -1 var placeToSplit = -1
idea/tests/org/jetbrains/kotlin/idea/OutdatedKotlinRuntimeNotificationTest.kt
+2
View File
@@ -54,6 +54,8 @@ class KotlinRuntimeLibraryUtilTest : TestCase() {
test("1.0.0-alpha", "1.0.0-alpha") test("1.0.0-alpha", "1.0.0-alpha")
test("1.2.2123-alpha-023", "1.2.2123-alpha-023") test("1.2.2123-alpha-023", "1.2.2123-alpha-023")
test("1.0.0-release-IJ143-75", "1.0.0") test("1.0.0-release-IJ143-75", "1.0.0")
test("1.0.2-eap-10-IJ141-10", "1.0.2-eap-10")
test("1.0.2-dev-825", "1.0.2")
test("1.0.1-rc-5-IJ143-7", "1.0.1-rc-5") test("1.0.1-rc-5-IJ143-7", "1.0.1-rc-5")
} }