summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorMathias <mathias@spray.cc>2011-09-06 12:01:56 +0200
committerMathias <mathias@spray.cc>2011-09-06 12:01:56 +0200
commit42336d2f1f9ae23d5271a1db81031a0ea13bcafa (patch)
tree3d0ccb91cee262bbb81eb70ee0cb40de3e4b3b61 /project
parent14670623eff7d5394eadc41c56056f2a5a047a70 (diff)
downloadspray-json-42336d2f1f9ae23d5271a1db81031a0ea13bcafa.tar.gz
spray-json-42336d2f1f9ae23d5271a1db81031a0ea13bcafa.tar.bz2
spray-json-42336d2f1f9ae23d5271a1db81031a0ea13bcafa.zip
Upgrade to scala 2.9.1 and specs2 1.6.1
Diffstat (limited to 'project')
-rw-r--r--project/build.properties2
-rw-r--r--project/build/Project.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/project/build.properties b/project/build.properties
index 4185256..729c026 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -2,5 +2,5 @@ project.organization=cc.spray.json
project.name=spray-json
sbt.version=0.7.7
project.version=1.1.0-SNAPSHOT
-build.scala.versions=2.9.0-1
+build.scala.versions=2.9.1
project.initialize=false
diff --git a/project/build/Project.scala b/project/build/Project.scala
index 7a214aa..325104f 100644
--- a/project/build/Project.scala
+++ b/project/build/Project.scala
@@ -27,7 +27,7 @@ class Project(info: ProjectInfo) extends DefaultProject(info) with posterous.Pub
// -------------------------------------------------------------------------------------------------------------------
// Testing with Specs2
// -------------------------------------------------------------------------------------------------------------------
- val specs2 = "org.specs2" %% "specs2" % "1.5" % "test" withSources()
+ val specs2 = "org.specs2" %% "specs2" % "1.6.1" % "test" withSources()
def specs2Framework = new TestFramework("org.specs2.runner.SpecsFramework")
override def testFrameworks = super.testFrameworks ++ Seq(specs2Framework)