Permalink
Browse files

Cherry-picked a few lines from paulp's scala-2.10 branch

  • Loading branch information...
1 parent cc4c762 commit 33ce0796cb4b49310e6bfb8d254cbeca7caaa18e @djspiewak committed Nov 26, 2012
Showing with 10 additions and 5 deletions.
  1. +9 −4 build.sbt
  2. +1 −1 project/build.properties
View
@@ -8,13 +8,18 @@ licenses := Seq("BSD-style" -> url("http://www.opensource.org/licenses/bsd-licen
homepage := Some(url("https://github.com/djspiewak/gll-combinators"))
-scalaVersion := "2.9.2"
+scalaVersion := "2.10.0-RC3"
-crossScalaVersions := Seq("2.9.1", "2.9.2")
+scalaBinaryVersion <<= (scalaVersion) {
+ case "2.10.0-RC3" => "2.10.0-RC2"
+ case v => v
+}
+
+crossScalaVersions := Seq("2.9.1", "2.9.2", "2.10.0-RC3")
libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % "1.10.0" % "test",
- "org.specs2" %% "specs2" % "1.12" % "test")
+ "org.specs2" %% "specs2" % "1.12.2" % "test")
logBuffered := false // gives us incremental output from Specs2
@@ -45,4 +50,4 @@ pomExtra := (
<name>Daniel Spiewak</name>
<url>http://www.codecommit.com/blog</url>
</developer>
- </developers>)
+ </developers>)
View
@@ -1 +1 @@
-sbt.version=0.11.3
+sbt.version=0.12.1

0 comments on commit 33ce079

Please sign in to comment.