Skip to content

Commit 9f568cd

Browse files
committed
Use AdoptOpenJDK JDK 8 and 11
Ref scala/scala-dev#587
1 parent 79ebd5a commit 9f568cd

File tree

1 file changed

+24
-11
lines changed

1 file changed

+24
-11
lines changed

.travis.yml

+24-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
dist: xenial
2+
group: stable
3+
14
language: scala
2-
jdk:
3-
- openjdk8
4-
- openjdk11
55

66
scala:
77
- 2.11.12
@@ -18,14 +18,26 @@ env:
1818
- secure: "OIVtcj7AHZr8Grpf03ZmZsygcADewiYIvSnRwLYCx+5AqOzs39EZ68DsIOxi7wEXVUbVj5RvLXpKzLX3iN+UszLOQRoFPFQyyn+3Y50f8T2aRxdZtInzXn0sCVTj4Hhd/zbKl1W+2Nh3Sqazab7tFoQVzEyYqhcPeiNRMF7h+aY="
1919
matrix:
2020
# The empty SCALAJS_VERSION will only compile for the JVM
21-
- SCALAJS_VERSION=
22-
- SCALAJS_VERSION=0.6.28
23-
- SCALAJS_VERSION=1.0.0-M8
21+
- SCALAJS_VERSION= ADOPTOPENJDK=8
22+
- SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
23+
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=11
2424

2525
matrix:
2626
include:
27-
- env: SCALANATIVE_VERSION=0.3.9
28-
jdk: openjdk8
27+
- env: SCALANATIVE_VERSION=0.3.9 ADOPTOPENJDK=8
28+
29+
before_install:
30+
# adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
31+
- "[[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"
32+
- curl -sL https://get.sdkman.io | bash
33+
- echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
34+
- source "$HOME/.sdkman/bin/sdkman-init.sh"
35+
36+
install:
37+
- sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | tail -1)
38+
- unset JAVA_HOME
39+
- java -Xmx32m -version
40+
- javac -J-Xmx32m -version
2941

3042
script: admin/build.sh
3143

@@ -40,6 +52,7 @@ before_cache:
4052
- find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
4153
cache:
4254
directories:
43-
- $HOME/.ivy2/cache
44-
- $HOME/.sbt/boot
45-
- $HOME/.sbt/launchers
55+
- $HOME/.ivy2/cache
56+
- $HOME/.sbt/boot
57+
- $HOME/.sbt/launchers
58+
- $HOME/.sdkman

0 commit comments

Comments
 (0)