Skip to content

Commit 2998e29

Browse files
committed
Use AdoptOpenJDK JDK 8 and 11
Ref scala/scala-dev#587 Fixes #335
1 parent 2234e39 commit 2998e29

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

.travis.yml

+23-17
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
language: scala
22

3-
jdk:
4-
- openjdk8
5-
- openjdk11
6-
73
scala:
84
- 2.12.8
95
- 2.13.0
@@ -19,20 +15,29 @@ env:
1915
- secure: "Xw7rI/qlML1nD2e2XwlakkhKAWNGZKqqE+Q3ntTvFpfHryl7KLCvVzJ4LIavnL6kGJaWOgy9vlSoEWn5g9nqHSfE31C/k5pY5nTMAKiwiJzfAS+r0asKXW2gmKhwtcTBkqyLVOZLCJSPVlFRQyfBJHY+Fs0L3KWcnMQgtBlyDhU="
2016
matrix:
2117
# The empty SCALAJS_VERSION will only compile for the JVM
22-
- SCALAJS_VERSION=
23-
- SCALAJS_VERSION=0.6.28
24-
- 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
2522

2623
matrix:
2724
exclude:
28-
- jdk: openjdk11
29-
env: SCALAJS_VERSION=0.6.28
30-
- jdk: openjdk11
31-
env: SCALAJS_VERSION=1.0.0-M8
32-
- scala: 0.15.0-RC1
33-
env: SCALAJS_VERSION=0.6.28
34-
- scala: 0.15.0-RC1
35-
env: SCALAJS_VERSION=1.0.0-M8
25+
- scala: 0.16.0-RC3
26+
env: SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
27+
- scala: 0.16.0-RC3
28+
env: SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
29+
30+
before_install:
31+
# adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
32+
- "[[ -d $HOME/.sdkman/bin ]] || rm -rf $HOME/.sdkman/"
33+
- curl -sL https://get.sdkman.io | bash
34+
- echo sdkman_auto_answer=true > "$HOME/.sdkman/etc/config"
35+
- source "$HOME/.sdkman/bin/sdkman-init.sh"
36+
37+
install:
38+
- sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
39+
- unset JAVA_HOME
40+
- java -Xmx32m -version
3641

3742
script:
3843
- admin/build.sh
@@ -42,5 +47,6 @@ before_cache:
4247
- find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
4348
cache:
4449
directories:
45-
- $HOME/.ivy2/cache
46-
- $HOME/.sbt
50+
- $HOME/.ivy2/cache
51+
- $HOME/.sbt
52+
- $HOME/.sdkman

admin/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ set -e
1616
# of the existing tag. Then a new tag can be created for that commit, e.g., `v1.2.3#2.13.0-M5`.
1717
# Everything after the `#` in the tag name is ignored.
1818

19-
if [[ "$TRAVIS_JDK_VERSION" == "openjdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then
19+
if [[ "$ADOPTOPENJDK" == "8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then
2020
RELEASE_COMBO=true;
2121
fi
2222

0 commit comments

Comments
 (0)