Updating build to include 2.9.3 & changelog updates

.travis.yml

@@ -2,6 +2,7 @@
 language: scala
 scala:
   - 2.10.0
+  - 2.9.3
   - 2.9.2
   - 2.9.1
 # Branches to test

project/CasbahBuild.scala

@@ -11,7 +11,7 @@ object CasbahBuild extends Build {
     organizationHomepage := Some(url("http://www.mongodb.org")),
     version      := "2.5.0",
     scalaVersion := "2.10.0",
-    crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1")
+    crossScalaVersions := Seq("2.10.0", "2.9.3", "2.9.2", "2.9.1")
   )
 
   val allSourceDirectories = SettingKey[Seq[Seq[File]]]("all-source-directories")
@@ -122,13 +122,15 @@ object Dependencies {
 
   def scalatime(scalaVersion: String) =
       scalaVersion match {
+        case "2.9.3" => "com.github.nscala-time" % "nscala-time_2.9.2" % "0.2.0"
         case _ => "com.github.nscala-time" %% "nscala-time" % "0.2.0"
       }
 
   def specs2(scalaVersion: String) =
       (scalaVersion match {
           case "2.9.1"   => "org.specs2" %% "specs2" % "1.12.2"
           case "2.9.2"   => "org.specs2" %% "specs2" % "1.12.3"
+          case "2.9.3"   => "org.specs2" % "specs2_2.9.2" % "1.12.3"
           case "2.10.0"   => "org.specs2" %% "specs2" % "1.14"
       }) % "test"
 }

sbt

@@ -113,7 +113,7 @@ declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory
 declare -r sbt_opts_file=".sbtopts"
 declare -r jvm_opts_file=".jvmopts"
 declare -r latest_28="2.8.2"
-declare -r latest_29="2.9.2"
+declare -r latest_29="2.9.3"
 declare -r latest_210="2.10.0"
 
 declare -r script_path=$(get_script_path "$BASH_SOURCE")

src/sphinx/changelog.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+Changes in Version 2.5.1
+------------------------
+
+- Updated pgp plugin
+- Added 2.9.3 support (SCALA-94)
+- Removed Specs2 and Scalaz dependencies outside test (SCALA-93)
+- Fixed 2.10 support, no need for -Yeta-expand-keeps-star compile flag (SCALA-89)
+
 Changes in Version 2.5.0
 ------------------------
 
@@ -21,7 +29,7 @@ Changes in Version 2.5.0
 Changes in Version 2.4.1
 ------------------------
 
--  Fixed QueryDSL imports for “default” (com.mongodb.casbah.Imports)
+-  Fixed QueryDSL imports for "default" (com.mongodb.casbah.Imports)
    import so that bareword ops like $set and $inc are available.
 
 Changes in Version 2.4.0
@@ -37,8 +45,8 @@ Changes in Version 2.4.0
 Changes in Version 2.3.0
 ------------------------
 
-BT/Maven Package change. Casbah is now available in: “org.mongodb” %%
-“casbah” % “2.3.0”
+BT/Maven Package change. Casbah is now available in: "org.mongodb" %%
+"casbah" % "2.3.0"
 
 -  Update mongo-java-driver to 2.8.0 release
 -  Updated to Mongo Java Driver 2.8.0-RC1
@@ -71,7 +79,7 @@ BT/Maven Package change. Casbah is now available in: “org.mongodb” %%
 
    -  SCALA-70: Removed type alias to com.mongodb.WriteConcern and made
       method args for it explicit, as it was causing a fun post-compile
-      (aka “library compiles, user code doesn’t”) implosion.
+      (aka "library compiles, user code doesn’t") implosion.
    -  added socketKeepAlive option
    -  Fixes SCALA-45: Allow filename and contentType to be nullable
    -  Retrieving filename or contentType on a GridFS File now returns
@@ -96,7 +104,7 @@ BT/Maven Package change. Casbah is now available in: “org.mongodb” %%
 
       -  Complete test suites for $and and $nor although they need to be
          updated to more appropriate contextual examples rather than
-         just “compiles properly”
+         just "compiles properly"
       -  New code logic, fixed $or, $and and $nor for proper nested list
          operations
       -  New :: list cons operator on MongoDBObject to create
@@ -120,7 +128,7 @@ BT/Maven Package change. Casbah is now available in: “org.mongodb” %%
       objects
    -  As part of above, you should get seq-like objects back from
       MongoDBList builders & factories instead of the previous
-      BasicDBList; this is part of attempting to “Hide” DBList and let
+      BasicDBList; this is part of attempting to "Hide" DBList and let
       people work with List/Seq
    -  SCALA-69: Immediately upon saving any None’s will be converted to
       null inside the DBObject for proper fetching later.
@@ -134,7 +142,7 @@ BT/Maven Package change. Casbah is now available in: “org.mongodb” %%
 
 -  Backport Test Helpers
 
-   -  New MongoDB “smart” test helpers for Specs2 and ScalaTest (Thanks
+   -  New MongoDB "smart" test helpers for Specs2 and ScalaTest (Thanks
       Bill Venners for the latter)
 
 -  Added SBT Rebel cut, local runner
@@ -150,7 +158,7 @@ Changes in Version 2.1.5.0
    (See `2.8.0 EOL Announcement`_)
 -  [2.9.0 only] Adjusted dynamic settings to build against 2.9.0-1 and
    Casbah 2.1.5.0
--  [2.9.0 only] Prototype “Dynamic” module (You must enable Scala’s
+-  [2.9.0 only] Prototype "Dynamic" module (You must enable Scala’s
    support for Dynamic)
 -  [2.9.0 only] I seem to have missed project files for SBT and
    casbah-dynamic
@@ -173,7 +181,7 @@ Changes in Version 2.1.0
    proxies JAVA-238
 -  Removed resetIndexCache, which has also been removed from the Java
    Driver
--  SCALA-21 Added “set metadata” method to match Java Driver (See
+-  SCALA-21 Added "set metadata" method to match Java Driver (See
    Java-261)
 -  SCALA-20 Updated to Java Driver 2.5
 
@@ -304,7 +312,7 @@ Notable Changes since Casbah 1.0.8.1:
    -  GridFS findOne now returns an Option[\_] and detects nulls like
       Collection
 
--  Added “safely” resource loaning methods on Collection & DB
+-  Added "safely" resource loaning methods on Collection & DB
 
    -  Given an operation, uses write concern / durability on a single
       connection and throws an exception if anything goes wrong.
@@ -351,9 +359,9 @@ Changes in Version 1.0.5
    MongoDBObject.getAs[A]. This should minimize odd runtime failures.
 -  Added toplevel detection in MongoDBObject’s +=/put methods to try and
    convert a MongoDBObject value to DBObject for you.
--  Added “Product” arguments to $pushAll - this means you can pass a
+-  Added "Product" arguments to $pushAll - this means you can pass a
    Tuple-style list, where previously it required an Iterable ( $pushAll
-   (“foo” -> (5, 10, 23, “spam”, eggs") should now work).
+   ("foo" -> (5, 10, 23, "spam", eggs") should now work).
 -  Updated to scalaj-collection 1.0 release, built against 2.8.0 final
 -  Added a new ScalaJ-Collection based Deserializer and Serializer
    layer. All base types supported by ScalaJ collection now use asJava /