Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Ross Lawley authored January 04, 2013
2  .travis.yml
... ...
@@ -1,7 +1,7 @@
1 1
 # See http://about.travis-ci.org/docs/user/build-configuration/
2 2
 language: scala
3 3
 scala:
4  
-  - 2.10.0-RC5
  4
+  - 2.10.0
5 5
   - 2.9.2
6 6
   - 2.9.1
7 7
   - 2.9.0-1
2  casbah-commons/src/main/scala/conversions/ScalaConversions.scala
@@ -29,7 +29,7 @@ import com.mongodb.casbah.commons.Logging
29 29
 
30 30
 import org.bson.{ BSON, Transformer }
31 31
 
32  
-import org.scala_tools.time.Imports._
  32
+import com.github.nscala_time.time.Imports._
33 33
 
34 34
 /**
35 35
  * " Register" Object, calls the registration methods.
2  casbah-core/src/main/scala/Implicits.scala
@@ -23,7 +23,7 @@
23 23
 package com.mongodb.casbah
24 24
 
25 25
 import scala.collection.JavaConverters._
26  
-import org.scala_tools.time.Imports._
  26
+import com.github.nscala_time.time.Imports._
27 27
 
28 28
 /**
29 29
  * <code>Implicits</code> object to expose implicit conversions to implementing classes
2  casbah-core/src/test/scala/ConversionsSpec.scala
@@ -25,7 +25,7 @@ package com.mongodb.casbah.test.commons.conversions
25 25
 import com.mongodb.casbah.Imports._
26 26
 import com.mongodb.casbah.commons.conversions.scala._
27 27
 
28  
-import org.scala_tools.time.Imports._
  28
+import com.github.nscala_time.time.Imports._
29 29
 import com.mongodb.casbah.commons.test.CasbahMutableSpecification
30 30
 import org.specs2.specification.BeforeExample
31 31
 import org.bson.BSON
2  casbah-core/src/test/scala/CoreWrappersSpec.scala
@@ -27,7 +27,7 @@ import com.mongodb.casbah.commons.Logging
27 27
 import com.mongodb.casbah.commons.conversions.scala._
28 28
 import com.mongodb.casbah.commons.test.CasbahMutableSpecification
29 29
 
30  
-import org.scala_tools.time.Imports._
  30
+import com.github.nscala_time.time.Imports._
31 31
 
32 32
 import com.mongodb.casbah.Imports._
33 33
 
2  casbah-core/src/test/scala/GroupSpec.scala
@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.mongodb.casbah
24 24
 
25  
-import org.scala_tools.time.Imports._
  25
+import com.github.nscala_time.time.Imports._
26 26
 
27 27
 import com.mongodb.casbah.Imports._
28 28
 import com.mongodb.casbah.commons.Logging
2  casbah-core/src/test/scala/MapReduceSpec.scala
@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.mongodb.casbah.test.core
24 24
 
25  
-import org.scala_tools.time.Imports._
  25
+import com.github.nscala_time.time.Imports._
26 26
 
27 27
 import com.mongodb.casbah.Imports._
28 28
 import com.mongodb.casbah.commons.Logging
2  casbah-core/src/test/scala/MongoClientOptionsSpec.scala
@@ -31,7 +31,7 @@ import com.mongodb.casbah.commons.test.CasbahMutableSpecification
31 31
 import javax.net.SocketFactory;
32 32
 import javax.net.ssl.SSLSocketFactory;
33 33
 
34  
-import org.scala_tools.time.Imports._
  34
+import com.github.nscala_time.time.Imports._
35 35
 
36 36
 
37 37
 class MongoClientOptionsSpec extends CasbahMutableSpecification {
2  casbah-core/src/test/scala/MongoClientSpec.scala
@@ -26,7 +26,7 @@ import com.mongodb.casbah.commons.Logging
26 26
 import com.mongodb.casbah.commons.conversions.scala._
27 27
 import com.mongodb.casbah.commons.test.CasbahMutableSpecification
28 28
 
29  
-import org.scala_tools.time.Imports._
  29
+import com.github.nscala_time.time.Imports._
30 30
 
31 31
 
32 32
 class MongoClientSpec extends CasbahMutableSpecification {
2  casbah-core/src/test/scala/RawMapReduceSpec.scala
@@ -26,7 +26,7 @@ import com.mongodb.casbah.Imports._
26 26
 import com.mongodb.casbah.commons.Logging
27 27
 import com.mongodb.casbah.commons.conversions.scala._
28 28
 
29  
-import org.scala_tools.time.Imports._
  29
+import com.github.nscala_time.time.Imports._
30 30
 
31 31
 import com.mongodb.casbah.Imports._
32 32
 
2  casbah-gridfs/src/main/scala/GridFS.scala
@@ -35,7 +35,7 @@ import java.io._
35 35
 import scala.reflect._
36 36
 import scala.collection.JavaConverters._
37 37
 
38  
-import org.scala_tools.time.Imports._
  38
+import com.github.nscala_time.time.Imports._
39 39
 
40 40
 // todo - look into potential naming conflicts...
41 41
 
2  casbah-gridfs/src/main/scala/JodaGridFS.scala
@@ -36,7 +36,7 @@ import java.io._
36 36
 import scala.reflect._
37 37
 import scala.collection.JavaConverters._
38 38
 
39  
-import org.scala_tools.time.Imports._
  39
+import com.github.nscala_time.time.Imports._
40 40
 
41 41
 /**
42 42
  * Companion object for GridFS.
2  casbah-gridfs/src/test/scala/GridFSSpec.scala
@@ -27,7 +27,7 @@ import com.mongodb.casbah.gridfs.Imports._
27 27
 import com.mongodb.casbah.commons.Logging
28 28
 
29 29
 
30  
-import org.scala_tools.time.Imports._
  30
+import com.github.nscala_time.time.Imports._
31 31
 
32 32
 import java.security.MessageDigest
33 33
 import java.io._
2  casbah-query/src/test/scala/DSLCoreOperatorsSpec.scala
@@ -26,7 +26,7 @@ import com.mongodb.casbah.commons.Logging
26 26
 import com.mongodb.casbah.commons.conversions.scala._
27 27
 import com.mongodb.casbah.query.Imports._
28 28
 
29  
-import org.scala_tools.time.Imports._
  29
+import com.github.nscala_time.time.Imports._
30 30
 
31 31
 import com.mongodb.casbah.commons.test.CasbahMutableSpecification
32 32
 
12  project/CasbahBuild.scala
@@ -10,7 +10,7 @@ object CasbahBuild extends Build {
10 10
     organization := "org.mongodb",
11 11
     organizationHomepage := Some(url("http://www.mongodb.org")),
12 12
     version      := "2.5.0-SNAPSHOT",
13  
-    crossScalaVersions := Seq("2.10.0-RC5", "2.9.2", "2.9.1", "2.9.0-1", "2.9.0")
  13
+    crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1")
14 14
   )
15 15
 
16 16
   // Load some test data
@@ -41,13 +41,13 @@ object CasbahBuild extends Build {
41 41
       autoCompilerPlugins := true,
42 42
       libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
43 43
         sv match {
44  
-          case "2.10.0-RC5" => deps
  44
+          case "2.10.0" => deps
45 45
           case _ => deps :+ compilerPlugin("org.scala-tools.sxr" % "sxr_2.9.0" % "0.2.7")
46 46
         }
47 47
       },
48 48
       scalacOptions <++= scalaVersion map { sv =>
49 49
         sv match {
50  
-          case "2.10.0-RC5" => Seq("-Yeta-expand-keeps-star")
  50
+          case "2.10.0" => Seq("-Yeta-expand-keeps-star")
51 51
           case _ => Seq()
52 52
         }
53 53
       },
@@ -123,9 +123,7 @@ object Dependencies {
123 123
 
124 124
   def scalatime(scalaVersion: String) =
125 125
       scalaVersion match {
126  
-        case "2.9.2" => "org.scala-tools.time" % "time_2.9.1" % "0.5"
127  
-        case "2.10.0-RC5" => "org.scalaj" % "scalaj-time_2.10.0-M7" % "0.6"
128  
-        case _ => "org.scala-tools.time" %% "time" % "0.5"
  126
+        case _ => "com.github.nscala-time" %% "nscala-time" % "0.2.0"
129 127
       }
130 128
 
131 129
   def specs2(scalaVersion: String) =
@@ -134,7 +132,7 @@ object Dependencies {
134 132
           case "2.9.0-1" => "org.specs2" % "specs2_2.9.0" % "1.7.1"
135 133
           case "2.9.1"   => "org.specs2" % "specs2_2.9.1" % "1.12.2"
136 134
           case "2.9.2"   => "org.specs2" % "specs2_2.9.2" % "1.12.2"
137  
-          case "2.10.0-RC5"   => "org.specs2" % "specs2_2.10.0-RC5" % "1.12.3"
  135
+          case "2.10.0"   => "org.specs2" %% "specs2" % "1.13"
138 136
       }
139 137
 }
140 138
 
4  src/sphinx/changelog.rst
Source Rendered
@@ -4,11 +4,13 @@ Changelog
4 4
 Changes in Version 2.5.0
5 5
 ------------------------
6 6
 
7  
--  Added support for Scala 2.10.0-RC5
  7
+-  Added support for Scala 2.10.0
  8
+-  Dropped support for Scala 2.9.0
8 9
 -  Dropped support for Scala 2.8.X
9 10
 -  Updated support for latest Java driver 2.10.1
10 11
 -  Added support for the new MongoClient connection class
11 12
 -  Removed scalaj.collections dependency
  13
+-  Updated to nscala-time
12 14
 -  Updated the build file
13 15
 -  Added unidoc and updated documentation
14 16
 -  Migrated documentation theme

0 notes on commit 9dec60a

Please sign in to comment.
Something went wrong with that request. Please try again.