diff --git a/.travis.yml b/.travis.yml index b90b86c..fe3371d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,17 +2,24 @@ dist: trusty sudo: true scala: - - "2.11.7" - jdk: - - oraclejdk7 - - oraclejdk8 - - openjdk8 + - "2.11.8" + - "2.12.1" before_script: + - jdk_switcher use ${JDK} - sh src/test/resources/setup_travis.sh before_install: - cat /etc/hosts env: - - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + global: + - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + matrix: + - JDK=oraclejdk7 + - JDK=oraclejdk8 + - JDK=openjdk8 addons: #workaround for openjdk buffer overflow - hostname: dummy \ No newline at end of file + hostname: dummy + matrix: + exclude: + - scala: 2.12.1 + env: JDK=oraclejdk7 diff --git a/build.sbt b/build.sbt index 19454a2..c6af2bb 100644 --- a/build.sbt +++ b/build.sbt @@ -5,16 +5,19 @@ organization := "com.mdialog" version := "1.2.0" -scalaVersion := "2.11.7" +scalaVersion := "2.12.1" + +crossScalaVersions := Seq("2.11.8", "2.12.1") parallelExecution := false scalacOptions ++= Seq("-unchecked", "-deprecation", "-language:postfixOps") libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-actor" % "2.3.14", - "org.scalatest" %% "scalatest" % "2.2.6" % "test", - "com.typesafe.akka" %% "akka-testkit" % "2.3.14" % "test", + "com.typesafe.akka" %% "akka-actor" % "2.4.16", + "org.zeromq" % "jzmq" % "3.1.0", + "org.scalatest" %% "scalatest" % "3.0.1" % "test", + "com.typesafe.akka" %% "akka-testkit" % "2.4.16" % "test", "com.novocode" % "junit-interface" % "0.11" % "test" )