Skip to content

Commit

Permalink
Merge pull request #27 from seratch/deps-minor-updates
Browse files Browse the repository at this point in the history
Bump minor versions of sbt, Scala and dependencies
  • Loading branch information
non committed Mar 23, 2015
2 parents 763de0a + 48f762a commit cad1e4e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,6 +1,6 @@
language: scala
scala:
- 2.10.4
- 2.11.2
- 2.10.5
- 2.11.6
jdk:
- openjdk7
8 changes: 4 additions & 4 deletions project/Build.scala
Expand Up @@ -9,8 +9,8 @@ object JawnBuild extends Build {
lazy val standardSettings = Seq(
organization := "org.spire-math",

scalaVersion := "2.11.4",
crossScalaVersions := Seq("2.10.4", "2.11.4"),
scalaVersion := "2.11.6",
crossScalaVersions := Seq("2.10.5", "2.11.6"),

homepage := Some(url("http://github.com/non/jawn/")),

Expand All @@ -37,8 +37,8 @@ object JawnBuild extends Build {
)

lazy val testDeps = Seq(
"org.scalatest" %% "scalatest" % "2.2.1" % "test",
"org.scalacheck" %% "scalacheck" % "1.11.6" % "test"
"org.scalatest" %% "scalatest" % "2.2.4" % "test",
"org.scalacheck" %% "scalacheck" % "1.12.2" % "test"
)

lazy val parser = Project(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=0.13.5
sbt.version=0.13.8

0 comments on commit cad1e4e

Please sign in to comment.