diff --git a/.travis.yml b/.travis.yml index 889f1e2..8eb0548 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,3 +16,23 @@ - $HOME/.coursier - $HOME/.embedmysql - $HOME/.embedpostgresql +matrix: + include: + - dist: trusty + group: edge + sudo: required + jdk: oraclejdk9 + script: + # https://github.com/sbt/sbt/pull/2951 + - git clone https://github.com/retronym/java9-rt-export + - cd java9-rt-export/ + - git checkout 1019a2873d057dd7214f4135e84283695728395d + - jdk_switcher use oraclejdk8 + - sbt package + - jdk_switcher use oraclejdk9 + - mkdir -p $HOME/.sbt/0.13/java9-rt-ext; java -jar target/java9-rt-export-*.jar $HOME/.sbt/0.13/java9-rt-ext/rt.jar + - jar tf $HOME/.sbt/0.13/java9-rt-ext/rt.jar | grep java/lang/Object + - cd .. + - echo "sbt.version=0.13.14-RC1" > project/build.properties + - wget https://raw.githubusercontent.com/paulp/sbt-extras/9ade5fa54914ca8aded44105bf4b9a60966f3ccd/sbt && chmod +x ./sbt + - ./sbt -Dscala.ext.dirs=$HOME/.sbt/0.13/java9-rt-ext test diff --git a/build.sbt b/build.sbt index cf4c130..ace5b0b 100644 --- a/build.sbt +++ b/build.sbt @@ -54,6 +54,7 @@ "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided", "junit" % "junit" % "4.12" % "test", "org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test", + "org.mockito" % "mockito-core" % "2.7.16" % "test", "com.wix" % "wix-embedded-mysql" % "2.1.4" % "test", "ru.yandex.qatools.embed" % "postgresql-embedded" % "1.14" % "test" )