Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable build for jdk9 #328

Merged
merged 3 commits into from
Aug 12, 2017
Merged

enable build for jdk9 #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c13244b
enable build for jdk9
brharrington Aug 11, 2017
f8240ca
remove the stty workaround
brharrington Aug 11, 2017
58bec5f
Merge remote-tracking branch 'nflx/master' into jdk9
brharrington Aug 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion buildViaTravis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down