Browse files

Make specs2 version defaultOrMapped

  • Loading branch information...
1 parent 6b9a859 commit d02b61d82b10195eeecad239a12dbb52b5d17000 @nafg nafg committed Sep 19, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 build.sbt
  2. +1 −1 project/Build.scala
  3. +2 −2 project/Dependencies.scala
View
2 build.sbt
@@ -15,7 +15,7 @@ organizationName in ThisBuild := "WorldWide Conferencing, LLC"
crossScalaVersions in ThisBuild := Seq("2.10.0-M7", "2.9.2", "2.9.1-1", "2.9.1")
-libraryDependencies in ThisBuild ++= Seq(specs2, scalacheck)
+libraryDependencies in ThisBuild <++= scalaVersion {sv => Seq(specs2(sv), scalacheck) }
// Settings for Sonatype compliance
pomIncludeRepository in ThisBuild := { _ => false }
View
2 project/Build.scala
@@ -91,7 +91,7 @@ object BuildDef extends Build {
.settings(description := "Webkit Library",
parallelExecution in Test := false,
libraryDependencies <++= scalaVersion { sv =>
- Seq(commons_fileupload, servlet_api, specs2.copy(configurations = Some("provided")), jetty6, jwebunit)
+ Seq(commons_fileupload, servlet_api, specs2(sv).copy(configurations = Some("provided")), jetty6, jwebunit)
},
libraryDependencies <++= scalaVersion { case "2.10.0-M7" => scalaactors::Nil case _ => Nil },
initialize in Test <<= (sourceDirectory in Test) { src =>
View
4 project/Dependencies.scala
@@ -80,7 +80,7 @@ object Dependencies {
lazy val jetty6 = "org.mortbay.jetty" % "jetty" % "6.1.26" % "test"
lazy val jwebunit = "net.sourceforge.jwebunit" % "jwebunit-htmlunit-plugin" % "2.5" % "test"
lazy val mockito_all = "org.mockito" % "mockito-all" % "1.9.0" % "test"
- lazy val scalacheck = "org.scalacheck" % "scalacheck" % "1.10.0" % "test" cross CVMappingAll
- lazy val specs2 = "org.specs2" % "specs2" % "1.12.1.1" % "test" cross CVMappingAll
+ lazy val scalacheck = "org.scalacheck" %% "scalacheck" % "1.10.0" % "test" cross CrossVersion.full
+ lazy val specs2: ModuleMap = "org.specs2" % "specs2" % defaultOrMapped("1.12.1","2.10.0-M7"->"1.12.1.1")(_) cross CrossVersion.full
}

0 comments on commit d02b61d

Please sign in to comment.