Skip to content

Commit aab5786

Browse files
committed
Use AdoptOpenJDK JDK 8 and 11
Fixes scala#38 Ref scala/scala-dev#587
1 parent 72a407c commit aab5786

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

.travis.yml

+20-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
language: scala
22

3-
jdk:
4-
- openjdk8
5-
- openjdk11
6-
73
scala:
84
- 2.13.0
95

10-
script:
11-
- admin/build.sh
12-
136
env:
147
global:
158
# PGP_PASSPHRASE
@@ -18,6 +11,25 @@ env:
1811
- secure: "Uc+tOT5E5FEQwLx4ZXZO1Oum1HAhMbvCWpKpkReqdsyb+xBdMbJkt43o8jvM/2WNVMcijEku87o5yWWa/fRDfqBg4GCuwnjUYu/3S0Lyxso8Mgmlcn6khmi09inOvAMVpCdBjvr+krJG1kXgxO62qA3IM0FU9z06Kcngz8F4YhnSGBv2HkOI/+9UHjQeex7tSUSFZi8itnEIN+gK4oWLVItyo0MbH4539BeJyoq/+e70xNxolLFHpVhruBQssg8MS60C5rajo7FXo1BODv+SIR+d1UZ6z8sl2iFU2psijej39nYHzmbxuM9P5Twozs38Rq7g4CM5aFLebna8VZoO6zZtM4PIAyiExkWWILQknrZEhHSded6l73GDeX+eoIigvYNxxAgXMh+MJll1i+XEySLjku8NvarQJ8c09x4S/Rjz1CBEfvlAhM+f117PqVsB87JBnsfE7CABfusJ2wqBpFf9pq9DA3E62XSEniWTIzow37YSR7opRv6wvHzuGrO6OeadIN1P2hb/FDiXDBnqG4xtGUFx81FM0dl9jV97kYiXoaqTwjT0j3d1MBGiN7IzeHxLbczMWA9mvvXtIeOxa73mph3grKKXiRqf/U+455oEIbCObEudjI7zXbjhXGeoVb+OqU7t5Beo+0Lg3H0hyntCsewops/h52lTmgsg5Hw="
1912
# SONA_PASS
2013
- secure: "ggXFZBlzV5ek/rBaE9lrEZlAIfUrv4XDJ4OrP8daMrJxmwkXtoSbcB3z4VgqqWKzAzW89CcU1IiojzDbe/het3xEX4qxdz5Wt05/E+WOgbek528kelwMxq12XRe6xaCVfG+y8OISPgq1q3vKoO/xYGVbK3D6hSD+cjojEXyPpjAfrVSUof06aNPFPQeLX9exgu9zrxkJJm01PbTh19vQk4Ojc++oEmpF7HLD1CF1m7AlW0U2Rba+syivpj9Ray3Z9vu0TnFL06r4TiwZruwcXTLrWUqumFI0r5mhaY6SNH7bqttu+3RPIOdkUGxIeGlkDi3xopt7r2aEkhOKvjRXapW0e/CWmUo1J+NnlIumxrldi4n0iiJGVEvY4Krx/HGZe0wCVTh4vDNOllTGdFmkkxN6WoaHALgj3QNM3XLjvvUu3VcT+QNtsVIvgUDesrtos8zCKczzdhL/d4BMiIg7SFfA33S3vx8BeczLBqddrx+yLSPzfheKrHW7g76EAEyN26vE2/2/GRlMOlG8Lmu8rXBfIPsK9T/ztfE1CxaTW5EsMSrxO2+O/bvAa6DY0R79KkHf7LDI+azzP2NwYx8anM9WlMTp4EbawI/KGZRilWYtJ3Q3y5EQERsrP71W35dKqiBFMPdspS+lTS9hGtso08n7cR2MwTbRjoXVRcWfJ/I="
14+
matrix:
15+
- ADOPTOPENJDK=8
16+
- ADOPTOPENJDK=11
17+
18+
before_install:
19+
# adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
20+
- "[[ -d $HOME/.sdkman/bin ]] || rm -rf $HOME/.sdkman/"
21+
- curl -sL https://get.sdkman.io | bash
22+
- echo sdkman_auto_answer=true > "$HOME/.sdkman/etc/config"
23+
- source "$HOME/.sdkman/bin/sdkman-init.sh"
24+
25+
install:
26+
- sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
27+
- unset JAVA_HOME
28+
- java -Xmx32m -version
29+
- javac -J-Xmx32m -version
30+
31+
script:
32+
- admin/build.sh
2133

2234
before_cache:
2335
- find $HOME/.sbt -name "*.lock" | xargs rm
@@ -27,3 +39,4 @@ cache:
2739
- $HOME/.ivy2/cache
2840
- $HOME/.sbt/boot
2941
- $HOME/.sbt/launchers
42+
- $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" ]]; then
19+
if [[ "$ADOPTOPENJDK" == "8" ]]; then
2020
RELEASE_COMBO=true;
2121
fi
2222

0 commit comments

Comments
 (0)