Skip to content

Commit d472b1e

Browse files
committed
make Scala.js work on JDK 10
1 parent 6809829 commit d472b1e

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

run.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ rm -rf target-*/project-builds || true
1313
rm -rf target-*/extraction || true
1414

1515
export LANG="en_US.UTF-8"
16-
if [[ `java -version 2>&1 | head -n 1` != *"1.8.0"* ]]; then
17-
# on Java 9+, the Scala.js build expects this property to be set.
18-
# note the kludgy specificity here, this will need further work
19-
# to be more flexible with different JVMs
16+
17+
# on Java 9+, the Scala.js build expects this property to be set.
18+
# note the kludgy specificity here, this will need further work
19+
# to be more flexible with different JVMs
20+
if [[ `java -version 2>&1 | head -n 1` == *"9.0."* ]]; then
2021
export SCALA_JS_OPTIONS=-Dscala.ext.dirs=$HOME/.sbt/0.13/java9-rt-ext-oracle_corporation_9_0_4
22+
elif [[ `java -version 2>&1 | head -n 1` == *"10.0."* ]]; then
23+
export SCALA_JS_OPTIONS=-Dscala.ext.dirs=$HOME/.sbt/0.13/java9-rt-ext-oracle_corporation_10_0_1
2124
else
2225
export SCALA_JS_OPTIONS=-Ddummy.ignore=nope
2326
fi

0 commit comments

Comments
 (0)