diff --git a/.travis.yml b/.travis.yml index 689c9e00..0eb36896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: scala scala: - 2.11.8 + - 2.12.1 jdk: - oraclejdk8 diff --git a/build.sbt b/build.sbt index fbc23a3d..749ed961 100644 --- a/build.sbt +++ b/build.sbt @@ -3,17 +3,18 @@ import com.typesafe.sbt.SbtGhPages.GhPagesKeys._ lazy val buildSettings = Seq( organization := "io.github.finagle", - version := "0.4.1", - scalaVersion := "2.11.8" + version := "0.4.2", + scalaVersion := "2.11.8", + crossScalaVersions := Seq("2.11.8","2.12.1") ) val baseSettings = Seq( resolvers += Resolver.bintrayRepo("jeremyrsmith", "maven"), libraryDependencies ++= Seq( - "com.twitter" %% "finagle-core" % "6.39.0", - "org.scalatest" %% "scalatest" % "3.0.0" % "test,it", + "com.twitter" %% "finagle-core" % "6.41.0", + "org.scalatest" %% "scalatest" % "3.0.1" % "test,it", "org.scalacheck" %% "scalacheck" % "1.13.4" % "test,it", - "io.github.jeremyrsmith" %% "scalamock-scalatest-support" % "3.0.0" % "test,it" + "org.scalamock" %% "scalamock-scalatest-support" % "3.4.2" % "test,it" ) ) @@ -59,7 +60,7 @@ lazy val `finagle-postgres-shapeless` = project .settings(allSettings) .settings(libraryDependencies ++= Seq( "com.chuusai" %% "shapeless" % "2.3.2", - "io.github.jeremyrsmith" %% "patchless" % "1.0.2" + "io.github.jeremyrsmith" %% "patchless" % "1.0.3" )) .configs(IntegrationTest) .dependsOn(`finagle-postgres`) diff --git a/project/plugins.sbt b/project/plugins.sbt index 64361c2c..df9dd829 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ resolvers ++= Seq( addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.6") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0.BETA1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4")