From 1ab7da52a2a753d97f25d8ccd19c21a903f1f98e Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim Date: Mon, 30 Jul 2012 02:02:03 -0400 Subject: [PATCH] Changes to build files --- build.sbt | 2 +- project/Build.scala | 2 +- project/Dependencies.scala | 15 ++++++--------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/build.sbt b/build.sbt index 1f3e05b0fe..09f73571c5 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ organizationName in ThisBuild := "WorldWide Conferencing, LLC" crossScalaVersions in ThisBuild := Seq("2.9.2", "2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0") -libraryDependencies in ThisBuild <++= scalaVersion { sv => Seq(specs, scalacheck).map(_(sv)) } +libraryDependencies in ThisBuild ++= Seq(specs2, scalacheck) // Settings for Sonatype compliance pomIncludeRepository in ThisBuild := { _ => false } diff --git a/project/Build.scala b/project/Build.scala index bca669b7ec..190b6e19fa 100644 --- a/project/Build.scala +++ b/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, specs(sv).copy(configurations = Some("provided")), jetty6, jwebunit) + Seq(commons_fileupload, servlet_api, specs2.copy(configurations = Some("provided")), jetty6, jwebunit) }, initialize in Test <<= (sourceDirectory in Test) { src => System.setProperty("net.liftweb.webapptest.src.test.webapp", (src / "webapp").absString) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index dc5ebbd1a7..fad08470d2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -23,16 +23,13 @@ object Dependencies { type ModuleMap = String => ModuleID - lazy val CVMapping282 = crossMapped("2.8.2" -> "2.8.1") lazy val CVMapping2911 = crossMapped("2.9.2" -> "2.9.1", "2.9.1-1" -> "2.9.1") - lazy val CVMappingAll = crossMapped("2.9.2" -> "2.9.1", "2.9.1-1" -> "2.9.1", "2.8.2" -> "2.8.1") + lazy val CVMappingAll = crossMapped("2.9.2" -> "2.9.1", "2.9.1-1" -> "2.9.1") lazy val slf4jVersion = "1.6.4" - lazy val scalazGroup = defaultOrMapped("org.scalaz", "2.8.0" -> "com.googlecode.scalaz") - lazy val scalazVersion = defaultOrMapped("6.0.4", "2.8.0" -> "5.0", "2.9.0" -> "6.0.RC2") - lazy val scalacheckVersion = defaultOrMapped("1.9", "2.8.0" -> "1.7", "2.8.1" -> "1.8", "2.8.2" -> "1.8") - lazy val specsVersion = defaultOrMapped("1.6.8", "2.8.0" -> "1.6.5", "2.9.1" -> "1.6.9", "2.9.1-1" -> "1.6.9", "2.9.2" -> "1.6.9") + lazy val scalazGroup = defaultOrMapped("org.scalaz") + lazy val scalazVersion = defaultOrMapped("6.0.4", "2.9.0" -> "6.0.RC2") // Compile scope: // Scope available in all classpath, transitive by default. @@ -80,8 +77,8 @@ object Dependencies { lazy val apacheds = "org.apache.directory.server" % "apacheds-server-integ" % "1.5.5" % "test" // TODO: 1.5.7 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.8.5" % "test" - lazy val scalacheck: ModuleMap = "org.scala-tools.testing" % "scalacheck" % scalacheckVersion(_) % "test" cross CVMappingAll - lazy val specs: ModuleMap = "org.scala-tools.testing" % "specs" % specsVersion(_) % "test" cross CVMappingAll + 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.11" % "test" cross CVMappingAll }