Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added support for Scala 2.10 final

  • Loading branch information...
commit 79fd98876e62044e87521c291e68b4a961cb6ebb 1 parent a8d7298
@davewhittaker davewhittaker authored
Showing with 5 additions and 8 deletions.
  1. +5 −8 project/SquerylBuild.scala
View
13 project/SquerylBuild.scala
@@ -10,7 +10,7 @@ object SquerylBuild extends Build {
settings = Project.defaultSettings /* ++ lsSettings */ ++ Seq(
description := "A Scala ORM and DSL for talking with Databases using minimum verbosity and maximum type safety",
organization := "org.squeryl",
- version := "0.9.5-5",
+ version := "0.9.5-6",
javacOptions := Seq("-source", "1.6", "-target", "1.6"),
version <<= version { v => //only release *if* -Drelease=true is passed to JVM
val release = Option(System.getProperty("release")) == Some("true")
@@ -25,10 +25,8 @@ object SquerylBuild extends Build {
},
parallelExecution := false,
publishMavenStyle := true,
- scalaVersion := "2.9.2",
- scalaBinaryVersion <<= scalaVersion { sv => sv },
- crossScalaVersions := Seq("2.10.0-RC5", "2.9.2", "2.9.1", "2.9.0-1", "2.9.0", "2.8.2", "2.8.1", "2.8.0"),
- crossVersion := CrossVersion.full,
+ scalaVersion := "2.10.0",
+ crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1", "2.9.0-1", "2.9.0", "2.8.2", "2.8.1", "2.8.0"),
licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
homepage := Some(url("http://squeryl.org")),
pomExtra := (<scm>
@@ -69,13 +67,12 @@ object SquerylBuild extends Build {
"postgresql" % "postgresql" % "8.4-701.jdbc4" % "provided",
"net.sourceforge.jtds" % "jtds" % "1.2.4" % "provided",
"org.apache.derby" % "derby" % "10.7.1.1" % "provided",
- "org.scala-lang" % "scala-actors" % "2.10.0-RC1" % "test",
"junit" % "junit" % "4.8.2" % "provided"),
libraryDependencies <++= scalaVersion { sv =>
Seq("org.scala-lang" % "scalap" % sv,
sv match {
- case sv if sv startsWith "2.10" =>
- "org.scalatest" % ("scalatest_" + sv) % "1.8-B1" % "test"
+ case sv if sv startsWith "2.10.0" =>
+ "org.scalatest" % ("scalatest_" + sv) % "1.8" % "test"
case sv if sv startsWith "2.9" =>
"org.scalatest" % "scalatest_2.9.2" % "1.6.1" % "test"
case _ =>
Please sign in to comment.
Something went wrong with that request. Please try again.