Skip to content

Commit 27a9462

Browse files
authored
Use AdoptOpenJDK JDK 8 and 11 (#228)
Use AdoptOpenJDK JDK 8 and 11
2 parents 79ebd5a + 8fbece0 commit 27a9462

File tree

1 file changed

+22
-11
lines changed

1 file changed

+22
-11
lines changed

Diff for: .travis.yml

+22-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
language: scala
2-
jdk:
3-
- openjdk8
4-
- openjdk11
52

63
scala:
74
- 2.11.12
@@ -18,14 +15,27 @@ env:
1815
- secure: "OIVtcj7AHZr8Grpf03ZmZsygcADewiYIvSnRwLYCx+5AqOzs39EZ68DsIOxi7wEXVUbVj5RvLXpKzLX3iN+UszLOQRoFPFQyyn+3Y50f8T2aRxdZtInzXn0sCVTj4Hhd/zbKl1W+2Nh3Sqazab7tFoQVzEyYqhcPeiNRMF7h+aY="
1916
matrix:
2017
# 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
18+
- SCALAJS_VERSION= ADOPTOPENJDK=8
19+
- SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
20+
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
21+
- SCALAJS_VERSION= ADOPTOPENJDK=11
2422

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

3040
script: admin/build.sh
3141

@@ -40,6 +50,7 @@ before_cache:
4050
- find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
4151
cache:
4252
directories:
43-
- $HOME/.ivy2/cache
44-
- $HOME/.sbt/boot
45-
- $HOME/.sbt/launchers
53+
- $HOME/.ivy2/cache
54+
- $HOME/.sbt/boot
55+
- $HOME/.sbt/launchers
56+
- $HOME/.sdkman

0 commit comments

Comments
 (0)