enable build for jdk9

Updates the travis config so that we build on both jdk8 and jdk9.
Netflix · Aug 11, 2017 · c13244b · c13244b
1 parent a449c4a
commit c13244b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,12 @@
 language: scala
-jdk:
-- oraclejdk8
+matrix:
+  include:
+  - jdk: oraclejdk8
+    env: BINTRAY_PUBLISH=true
+  - jdk: oraclejdk9
+    env: BINTRAY_PUBLISH=false
 scala:
-- 2.11.8
+- 2.12.3
 sudo: false
 script:
 - ./buildViaTravis.sh

diff --git a/buildViaTravis.sh b/buildViaTravis.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # This script will build the project.
 
-if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$BINTRAY_PUBLISH" == "false" ]; then
   echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
   make build
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,7 +9,7 @@ object Dependencies {
     val jackson    = "2.8.7"
     val rxnetty    = "0.4.20"
     val rxscala    = "0.26.5"
-    val scala      = "2.11.11"
+    val scala      = "2.12.3"
     val slf4j      = "1.7.25"
     val spectator  = "0.57.1"
   }