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

Merge pull request #182 from smarter/java10 

Support Java 10
This commit is contained in:
eugene yokota 2017-09-26 18:32:55 -04:00 committed by GitHub
parent bc00a5490c 32e8859df6
commit 470da7bd9e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,13 +189,14 @@ syncPreloaded() {
checkJava() { checkJava() {
local required_version="$1" local required_version="$1"
# Now check to see if it's a good enough version # Now check to see if it's a good enough version
local good_enough="$(echo "$java_version >= $required_version" | bc)"
if [[ "$java_version" == "" ]]; then if [[ "$java_version" == "" ]]; then
echo echo
echo No java installations was detected. echo No java installations was detected.
echo Please go to http://www.java.com/getjava/ and download echo Please go to http://www.java.com/getjava/ and download
echo echo
exit 1 exit 1
elif [[ "$java_version" < "$required_version" ]]; then elif [[ "$good_enough" != "1" ]]; then
echo echo
echo The java installation you have is not up to date echo The java installation you have is not up to date
echo $script_name requires at least version $required_version+, you have echo $script_name requires at least version $required_version+, you have
@ -209,7 +210,8 @@ checkJava() {
} }
copyRt() { copyRt() {
if [[ "$java_version" == "9" ]]; then local at_least_9="$(echo "$java_version >= 9" | bc)"
if [[ "$at_least_9" == "1" ]]; then
rtexport=$(rt_export_file) rtexport=$(rt_export_file)
java9_ext=$("$java_cmd" ${JAVA_OPTS} ${SBT_OPTS:-$default_sbt_opts} ${java_args[@]} \ java9_ext=$("$java_cmd" ${JAVA_OPTS} ${SBT_OPTS:-$default_sbt_opts} ${java_args[@]} \
-jar "$rtexport" --rt-ext-dir) -jar "$rtexport" --rt-ext-dir)