Move to Scala 2.11.2

Fashionbase · Aug 7, 2014 · e94bd4c · e94bd4c
1 parent 0b3a560
commit e94bd4c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -12,9 +12,9 @@ startYear in ThisBuild             := Some(2006)
 
 organizationName in ThisBuild      := "WorldWide Conferencing, LLC"
 
-scalaVersion in ThisBuild          := "2.11.1"
+scalaVersion in ThisBuild          := "2.11.2"
 
-crossScalaVersions in ThisBuild    := Seq("2.11.1")
+crossScalaVersions in ThisBuild    := Seq("2.11.2")
 
 libraryDependencies in ThisBuild <++= scalaVersion {sv => Seq(specs2(sv), scalacheck, scalatest(sv)) }
 

diff --git a/project/Build.scala b/project/Build.scala
@@ -41,7 +41,7 @@ object BuildDef extends Build {
       .settings(description := "Common Libraties and Utilities",
                 libraryDependencies ++= Seq(slf4j_api, logback, slf4j_log4j12),
                 libraryDependencies <++= scalaVersion {
-                  case "2.11.0" | "2.11.1" => Seq(scala_xml, scala_parser)
+                  case "2.11.2" => Seq(scala_xml, scala_parser)
                   case _ => Seq()
                 }
       )
@@ -58,7 +58,7 @@ object BuildDef extends Build {
                   parallelExecution in Test := false,
                   libraryDependencies <++= scalaVersion { sv => Seq(scalatest(sv), junit) },
                   libraryDependencies <++= scalaVersion {
-                    case "2.11.0" | "2.11.1" => Seq(scala_xml, scala_parser)
+                    case "2.11.2" => Seq(scala_xml, scala_parser)
                     case _ => Seq()
                   }
       )

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -23,15 +23,15 @@ object Dependencies {
 
   type ModuleMap = String => ModuleID
 
-  lazy val CVMappingAll  = crossMapped("2.10.0" -> "2.10", "2.10.1" -> "2.10", "2.10.2" -> "2.10", "2.10.3" -> "2.10", "2.10.4" -> "2.10", "2.11.0" -> "2.11", "2.11.1" -> "2.11")
+  lazy val CVMappingAll  = crossMapped("2.10.0" -> "2.10", "2.10.1" -> "2.10", "2.10.2" -> "2.10", "2.10.3" -> "2.10", "2.10.4" -> "2.10", "2.11.0" -> "2.11", "2.11.1" -> "2.11", "2.11.2" -> "2.11")
 
   lazy val slf4jVersion = "1.7.2"
 
   lazy val scalazGroup        = defaultOrMapped("org.scalaz")
   lazy val scalazVersion      = defaultOrMapped("6.0.4")
-  lazy val scalaz7Version     = defaultOrMapped("7.0.0",  "2.11.0" -> "7.0.6", "2.11.1" -> "7.0.6")
-  lazy val specs2Version      = defaultOrMapped("1.12.3", "2.11.0" -> "2.3.11", "2.11.1" -> "2.3.11")
-  lazy val scalatestVersion   = defaultOrMapped("1.9.1",  "2.11.0" -> "2.1.3", "2.11.1" -> "2.1.3")
+  lazy val scalaz7Version     = defaultOrMapped("7.0.0",  "2.11.2" -> "7.0.6")
+  lazy val specs2Version      = defaultOrMapped("1.12.3", "2.11.2" -> "2.3.11")
+  lazy val scalatestVersion   = defaultOrMapped("1.9.1",  "2.11.2" -> "2.1.3")
 
   // Compile scope:
   // Scope available in all classpath, transitive by default.