luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #209 from 2m/wip-handle-jdk-10-version-2m 

Handle JDK 10 version string
This commit is contained in:
Dale Wijnand 2018-02-05 10:13:58 +00:00 committed by GitHub
parent bf9cd40349 e15633064b
commit f035626b18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/universal/bin/sbt-launch-lib.bash
View File

@ -179,8 +179,14 @@ process_args () {
process_my_args "${myargs[@]}"
}
## parses 1.7, 1.8, 9, etc out of java version "1.8.0_91"
java_version=$("$java_cmd" -Xms128M -Xmx512M -version 2>&1 | tr '\r' '\n' | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
## parses java version from the -version output line, e.g.:
## java version "10-ea" 2018-03-20 --> 10
## openjdk version "9" --> 9
## java version "1.8.0_162" --> 1.8
## openjdk version "1.8.0_144" --> 1.8
## java version "1.7.0_151" --> 1.7
## java version "1.6.0_45" --> 1.6
java_version=$("$java_cmd" -Xms128M -Xmx512M -version 2>&1 | tr '\r' '\n' | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*/\1\2/; 1q')
vlog "[process_args] java_version = '$java_version'"
}