From cd9a90e910aa513c950a913a751e5a12480bb5e4 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Sun, 8 Mar 2015 13:36:01 -0400 Subject: [PATCH] Updated versions --- .travis.yml | 4 ++-- build.sbt | 16 ++++++++++------ project/plugins.sbt | 7 ++----- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f5584e..a8718f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ sudo: false language: scala scala: - - 2.10.4 - - 2.11.4 + - 2.10.5 + - 2.11.6 jdk: - oraclejdk7 diff --git a/build.sbt b/build.sbt index c9599cd..5e6fc66 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ lazy val commonSettings = doctestSettings ++ Seq( name := "syzygist", organization := "org.syzygist", - scalaVersion := "2.11.4", - crossScalaVersions := Seq("2.10.4", "2.11.4"), + scalaVersion := "2.11.6", + crossScalaVersions := Seq("2.10.5", "2.11.6"), scalacOptions := Seq( "-feature", "-language:higherKinds", @@ -11,11 +11,15 @@ lazy val commonSettings = doctestSettings ++ Seq( ), resolvers += "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases", doctestWithDependencies := false, + dependencyUpdatesFailBuild := true, + dependencyUpdatesExclusions := + moduleFilter("org.scalaz.stream", "scalaz-stream", "0.6a") | + moduleFilter(organization = "org.scoverage", revision = "1.0.1"), libraryDependencies ++= Seq( - "org.scalaz" %% "scalaz-concurrent" % "7.1.0", - "org.scalaz" %% "scalaz-core" % "7.1.0", + "org.scalaz" %% "scalaz-concurrent" % "7.1.1", + "org.scalaz" %% "scalaz-core" % "7.1.1", "org.scalaz.stream" %% "scalaz-stream" % "0.6a", - "org.scalacheck" %% "scalacheck" % "1.12.1" % "test" + "org.scalacheck" %% "scalacheck" % "1.12.2" % "test" ) ) @@ -31,4 +35,4 @@ lazy val split = project.settings(moduleName := "syzygist-split") lazy val parse = project.settings(moduleName := "syzygist-split") .settings(commonSettings: _*) - .settings(libraryDependencies += "org.parboiled" %% "parboiled" % "2.0.1") + .settings(libraryDependencies += "org.parboiled" %% "parboiled" % "2.1.0") diff --git a/project/plugins.sbt b/project/plugins.sbt index 05e8d61..aa094b5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,7 @@ resolvers += Classpaths.sbtPluginReleases addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.3.4") - -addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.7") - -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.1") - +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.8") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0.BETA1")