Merge pull request #370 from ashawley/install-jdk.sh

Use install-jdk.sh for AdoptOpenJDK

Author: ashawley

.travis.yml

@@ -1,33 +1,37 @@
 language: scala
 
+# This sets $TRAVIS_JDK_VERSION which is used, in turn, to get a
+# version of AdoptOpenJDK with the install-jdk.sh command.
+jdk:
+  - openjdk8
+  - openjdk11
+
 scala:
   - 0.18.1-RC1
   - 2.12.10
   - 2.13.1
 
 env:
-  - SCALAJS_VERSION=         ADOPTOPENJDK=8
-  - SCALAJS_VERSION=0.6.31   ADOPTOPENJDK=8
-  - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
-  - SCALAJS_VERSION=         ADOPTOPENJDK=11
+  # The empty SCALAJS_VERSION will only compile for the JVM
+  - SCALAJS_VERSION=
+  - SCALAJS_VERSION=0.6.31
+  - SCALAJS_VERSION=1.0.0-M8
 
 matrix:
   exclude:
+    - jdk: openjdk11
+      env: SCALAJS_VERSION=0.6.29
+    - jdk: openjdk11
+      env: SCALAJS_VERSION=1.0.0-M8
     - scala: 0.18.1-RC1
-      env: SCALAJS_VERSION=0.6.31   ADOPTOPENJDK=8
+      env: SCALAJS_VERSION=0.6.31
     - scala: 0.18.1-RC1
-      env: SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
-
-before_install:
-  # adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
-  - "[[ -d $HOME/.sdkman/bin ]] || rm -rf $HOME/.sdkman/"
-  - curl -sL https://get.sdkman.io | bash
-  - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
-  - source "$HOME/.sdkman/bin/sdkman-init.sh"
+      env: SCALAJS_VERSION=1.0.0-M8
 
 install:
-  - sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
-  - unset JAVA_HOME
+  - export JAVA_HOME=$HOME/$TRAVIS_JDK_VERSION
+  - install-jdk.sh --url "https://api.adoptopenjdk.net/v2/binary/releases/$TRAVIS_JDK_VERSION?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&heap_size=normal&type=jdk" --target $JAVA_HOME
+  - export PATH=$JAVA_HOME/bin:$PATH
   - java -Xmx32m -version
   - git fetch --tags # get all tags for sbt-dynver
 
@@ -42,5 +46,4 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt
-    - $HOME/.sdkman
     - $HOME/.cache/coursier

build.sh

@@ -16,7 +16,7 @@ set -e
 
 # For normal tags that are cross-built, we release on JDK 8 for Scala 2.x
 isReleaseJob() {
-  if [[ "$ADOPTOPENJDK" == "8" && "$TRAVIS_SCALA_VERSION" =~ ^2\.1[234]\..*$ ]]; then
+  if [[ "$TRAVIS_JDK_VERSION" == "openjdk8" && "$TRAVIS_SCALA_VERSION" =~ ^2\.1[234]\..*$ ]]; then
     true
   else
     false
@@ -25,7 +25,7 @@ isReleaseJob() {
 
 # For tags that define a Scala version, we pick the jobs of one Scala version (2.13.x) to do the releases
 isTagScalaReleaseJob() {
-  if [[ "$ADOPTOPENJDK" == "8" && "$TRAVIS_SCALA_VERSION" =~ ^2\.13\.[0-9]+$ ]]; then
+  if [[ "$TRAVIS_JDK_VERSION" == "openjdk8" && "$TRAVIS_SCALA_VERSION" =~ ^2\.13\.[0-9]+$ ]]; then
     true
   else
     false
@@ -46,7 +46,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
   tagScalaVer=$(echo $TRAVIS_TAG | sed s/[^#]*// | sed s/^#//)
   if [[ "$tagScalaVer" == "" ]]; then
     if ! isReleaseJob; then
-      echo "Not releasing on Java $ADOPTOPENJDK with Scala $TRAVIS_SCALA_VERSION"
+      echo "Not releasing on Java ${TRAVIS_JDK_VERSION#openjdk} with Scala $TRAVIS_SCALA_VERSION"
       exit 0
     fi
   else