Skip to content

Commit

Permalink
Assure we get the selected JDK
Browse files Browse the repository at this point in the history
  • Loading branch information
ennru committed Sep 15, 2020
1 parent 0dd9766 commit 844dc9c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ git:

before_install:
# using jabba for custom jdk management
- if [ ! -f ~/.jabba/jabba.sh ]; then curl -L -v --retry 5 -o jabba-install.sh https://raw.githubusercontent.com/shyiko/jabba/0.11.2/install.sh && bash jabba-install.sh; fi
- . ~/.jabba/jabba.sh
# see ./scripts/build.sh

# default script for jobs, that do not have any specified
script: ./scripts/travis.sh
Expand Down
8 changes: 7 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ lazy val googleCloudPubSubGrpc = alpakkaProject(
"-P:silencer:pathFilters=akka-grpc/main",
"-P:silencer:pathFilters=akka-grpc/test"
),
javacOptions := javacOptions.value.filterNot(_ == "-Xlint:deprecation"),
crossScalaVersions --= Seq(Dependencies.Scala211) // 2.11 is not supported since Akka gRPC 0.6
).enablePlugins(AkkaGrpcPlugin)

Expand Down Expand Up @@ -259,7 +260,12 @@ lazy val springWeb = alpakkaProject("spring-web", "spring.web", Dependencies.Spr

lazy val simpleCodecs = alpakkaProject("simple-codecs", "simplecodecs")

lazy val slick = alpakkaProject("slick", "slick", Dependencies.Slick)
lazy val slick = alpakkaProject(
"slick",
"slick",
Dependencies.Slick,
javacOptions := javacOptions.value.filterNot(_ == "-Xlint:deprecation")
)

lazy val eventbridge = alpakkaProject("aws-event-bridge", "aws.eventbridge", Dependencies.Eventbridge)

Expand Down
4 changes: 4 additions & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ CMD=$2

[ "$TRAVIS_EVENT_TYPE" == "cron" ] && JDK="adopt@~1.11-0" || JDK="adopt@~1.8-0"

# using jabba for custom jdk management
if [ ! -f ~/.jabba/jabba.sh ]; then curl -L -v --retry 5 -o jabba-install.sh https://raw.githubusercontent.com/shyiko/jabba/0.11.2/install.sh && bash jabba-install.sh; fi
. ~/.jabba/jabba.sh

~/.jabba/bin/jabba install "$JDK"
~/.jabba/bin/jabba use "$JDK"
java -version
Expand Down

0 comments on commit 844dc9c

Please sign in to comment.