Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated to scala 2.10.0

Had to drop 2.9.0 / 2.9.0-1 support due to
nscala-time library doesn't support them.
  • Loading branch information...
commit 9dec60a7ccfcdc9e4a3c09d1cfed94be6dcae568 1 parent f7b685f
@rozza rozza authored
View
2  .travis.yml
@@ -1,7 +1,7 @@
# See http://about.travis-ci.org/docs/user/build-configuration/
language: scala
scala:
- - 2.10.0-RC5
+ - 2.10.0
- 2.9.2
- 2.9.1
- 2.9.0-1
View
2  casbah-commons/src/main/scala/conversions/ScalaConversions.scala
@@ -29,7 +29,7 @@ import com.mongodb.casbah.commons.Logging
import org.bson.{ BSON, Transformer }
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
/**
* " Register" Object, calls the registration methods.
View
2  casbah-core/src/main/scala/Implicits.scala
@@ -23,7 +23,7 @@
package com.mongodb.casbah
import scala.collection.JavaConverters._
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
/**
* <code>Implicits</code> object to expose implicit conversions to implementing classes
View
2  casbah-core/src/test/scala/ConversionsSpec.scala
@@ -25,7 +25,7 @@ package com.mongodb.casbah.test.commons.conversions
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.commons.conversions.scala._
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
import com.mongodb.casbah.commons.test.CasbahMutableSpecification
import org.specs2.specification.BeforeExample
import org.bson.BSON
View
2  casbah-core/src/test/scala/CoreWrappersSpec.scala
@@ -27,7 +27,7 @@ import com.mongodb.casbah.commons.Logging
import com.mongodb.casbah.commons.conversions.scala._
import com.mongodb.casbah.commons.test.CasbahMutableSpecification
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
import com.mongodb.casbah.Imports._
View
2  casbah-core/src/test/scala/GroupSpec.scala
@@ -22,7 +22,7 @@
package com.mongodb.casbah
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.commons.Logging
View
2  casbah-core/src/test/scala/MapReduceSpec.scala
@@ -22,7 +22,7 @@
package com.mongodb.casbah.test.core
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.commons.Logging
View
2  casbah-core/src/test/scala/MongoClientOptionsSpec.scala
@@ -31,7 +31,7 @@ import com.mongodb.casbah.commons.test.CasbahMutableSpecification
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory;
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
class MongoClientOptionsSpec extends CasbahMutableSpecification {
View
2  casbah-core/src/test/scala/MongoClientSpec.scala
@@ -26,7 +26,7 @@ import com.mongodb.casbah.commons.Logging
import com.mongodb.casbah.commons.conversions.scala._
import com.mongodb.casbah.commons.test.CasbahMutableSpecification
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
class MongoClientSpec extends CasbahMutableSpecification {
View
2  casbah-core/src/test/scala/RawMapReduceSpec.scala
@@ -26,7 +26,7 @@ import com.mongodb.casbah.Imports._
import com.mongodb.casbah.commons.Logging
import com.mongodb.casbah.commons.conversions.scala._
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
import com.mongodb.casbah.Imports._
View
2  casbah-gridfs/src/main/scala/GridFS.scala
@@ -35,7 +35,7 @@ import java.io._
import scala.reflect._
import scala.collection.JavaConverters._
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
// todo - look into potential naming conflicts...
View
2  casbah-gridfs/src/main/scala/JodaGridFS.scala
@@ -36,7 +36,7 @@ import java.io._
import scala.reflect._
import scala.collection.JavaConverters._
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
/**
* Companion object for GridFS.
View
2  casbah-gridfs/src/test/scala/GridFSSpec.scala
@@ -27,7 +27,7 @@ import com.mongodb.casbah.gridfs.Imports._
import com.mongodb.casbah.commons.Logging
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
import java.security.MessageDigest
import java.io._
View
2  casbah-query/src/test/scala/DSLCoreOperatorsSpec.scala
@@ -26,7 +26,7 @@ import com.mongodb.casbah.commons.Logging
import com.mongodb.casbah.commons.conversions.scala._
import com.mongodb.casbah.query.Imports._
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
import com.mongodb.casbah.commons.test.CasbahMutableSpecification
View
12 project/CasbahBuild.scala
@@ -10,7 +10,7 @@ object CasbahBuild extends Build {
organization := "org.mongodb",
organizationHomepage := Some(url("http://www.mongodb.org")),
version := "2.5.0-SNAPSHOT",
- crossScalaVersions := Seq("2.10.0-RC5", "2.9.2", "2.9.1", "2.9.0-1", "2.9.0")
+ crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1")
)
// Load some test data
@@ -41,13 +41,13 @@ object CasbahBuild extends Build {
autoCompilerPlugins := true,
libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
sv match {
- case "2.10.0-RC5" => deps
+ case "2.10.0" => deps
case _ => deps :+ compilerPlugin("org.scala-tools.sxr" % "sxr_2.9.0" % "0.2.7")
}
},
scalacOptions <++= scalaVersion map { sv =>
sv match {
- case "2.10.0-RC5" => Seq("-Yeta-expand-keeps-star")
+ case "2.10.0" => Seq("-Yeta-expand-keeps-star")
case _ => Seq()
}
},
@@ -123,9 +123,7 @@ object Dependencies {
def scalatime(scalaVersion: String) =
scalaVersion match {
- case "2.9.2" => "org.scala-tools.time" % "time_2.9.1" % "0.5"
- case "2.10.0-RC5" => "org.scalaj" % "scalaj-time_2.10.0-M7" % "0.6"
- case _ => "org.scala-tools.time" %% "time" % "0.5"
+ case _ => "com.github.nscala-time" %% "nscala-time" % "0.2.0"
}
def specs2(scalaVersion: String) =
@@ -134,7 +132,7 @@ object Dependencies {
case "2.9.0-1" => "org.specs2" % "specs2_2.9.0" % "1.7.1"
case "2.9.1" => "org.specs2" % "specs2_2.9.1" % "1.12.2"
case "2.9.2" => "org.specs2" % "specs2_2.9.2" % "1.12.2"
- case "2.10.0-RC5" => "org.specs2" % "specs2_2.10.0-RC5" % "1.12.3"
+ case "2.10.0" => "org.specs2" %% "specs2" % "1.13"
}
}
View
4 src/sphinx/changelog.rst
@@ -4,11 +4,13 @@ Changelog
Changes in Version 2.5.0
------------------------
-- Added support for Scala 2.10.0-RC5
+- Added support for Scala 2.10.0
+- Dropped support for Scala 2.9.0
- Dropped support for Scala 2.8.X
- Updated support for latest Java driver 2.10.1
- Added support for the new MongoClient connection class
- Removed scalaj.collections dependency
+- Updated to nscala-time
- Updated the build file
- Added unidoc and updated documentation
- Migrated documentation theme
Please sign in to comment.
Something went wrong with that request. Please try again.