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

Search java version in java.specification.version, prepare to that starting from java 9 it will contain only a single component.

Browse Source
This commit is contained in:
Ilya Gorbunov
2017-02-02 19:07:23 +03:00
parent 62e42d6f45
commit af443ac046
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt
+4 -2
View File
@@ -40,9 +40,11 @@ internal val IMPLEMENTATIONS: PlatformImplementations = run {
private fun getJavaVersion(): Int { private fun getJavaVersion(): Int {
val default = 0x10006 val default = 0x10006
val version = System.getProperty("java.version") ?: return default val version = System.getProperty("java.specification.version") ?: return default
val firstDot = version.indexOf('.') val firstDot = version.indexOf('.')
if (firstDot < 0) return default if (firstDot < 0)
return try { version.toInt() * 0x10000 } catch (e: NumberFormatException) { default }
var secondDot = version.indexOf('.', firstDot + 1) var secondDot = version.indexOf('.', firstDot + 1)
if (secondDot < 0) secondDot = version.length if (secondDot < 0) secondDot = version.length