upgrade scalalib

joeyksclark · Dec 4, 2013 · 84d61f0 · 84d61f0
1 parent 799a8a1
commit 84d61f0
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 18 deletions.
diff --git a/modules/analyse/src/main/AnalysisRepo.scala b/modules/analyse/src/main/AnalysisRepo.scala
@@ -1,7 +1,7 @@
 package lila.analyse
 
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 import play.api.libs.json.Json
 
 import lila.db.api._

diff --git a/modules/game/src/main/Game.scala b/modules/game/src/main/Game.scala
@@ -4,7 +4,7 @@ import chess.Color._
 import chess.Pos.piotr, chess.Role.forsyth
 import chess.{ History ⇒ ChessHistory, Castles, Role, Board, Move, Pos, Game ⇒ ChessGame, Clock, Status, Color, Piece, Variant, Mode }
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 
 import lila.db.ByteArray
 import lila.user.User

diff --git a/modules/game/src/main/GameRepo.scala b/modules/game/src/main/GameRepo.scala
@@ -5,7 +5,7 @@ import scala.util.Random
 import chess.format.Forsyth
 import chess.{ Color, Variant, Status }
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 import play.api.libs.json._
 import play.modules.reactivemongo.json.BSONFormats.toJSON
 import play.modules.reactivemongo.json.ImplicitBSONHandlers.JsObjectWriter

diff --git a/modules/game/src/main/Query.scala b/modules/game/src/main/Query.scala
@@ -2,7 +2,7 @@ package lila.game
 
 import chess.{ Color, Status }
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 import play.api.libs.json._
 
 import lila.db.api._

diff --git a/modules/gameSearch/src/main/DataForm.scala b/modules/gameSearch/src/main/DataForm.scala
@@ -1,11 +1,11 @@
 package lila.gameSearch
 
+import chess.{ Mode }
+import com.github.nscala_time.time.Imports._
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
 import play.api.data._
 import play.api.data.Forms._
 
-import chess.{ Mode }
 import lila.common.Form._
 import lila.search.Range
 

diff --git a/modules/gameSearch/src/main/Query.scala b/modules/gameSearch/src/main/Query.scala
@@ -3,7 +3,7 @@ package lila.gameSearch
 import Game.fields
 import org.elasticsearch.index.query._, FilterBuilders._, QueryBuilders._
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 
 import chess.{ Variant, Mode, Status, EcoDb }
 import lila.common.EloRange

diff --git a/modules/lobby/src/main/HookRepo.scala b/modules/lobby/src/main/HookRepo.scala
@@ -1,7 +1,7 @@
 package lila.lobby
 
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 
 object HookRepo {
 

diff --git a/modules/mod/src/main/Modlog.scala b/modules/mod/src/main/Modlog.scala
@@ -1,7 +1,7 @@
 package lila.mod
 
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 
 case class Modlog(
  mod: String,

diff --git a/modules/security/src/main/Flood.scala b/modules/security/src/main/Flood.scala
@@ -3,7 +3,7 @@ package lila.security
 import scala.concurrent.duration.Duration
 
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 
 import lila.memo.Builder
 

diff --git a/modules/security/src/main/UserSpy.scala b/modules/security/src/main/UserSpy.scala
@@ -2,6 +2,7 @@ package lila.security
 
 import scala.concurrent.Future
 
+import com.github.nscala_time.time.Imports._
 import play.api.libs.json._
 import play.api.mvc.RequestHeader
 import play.modules.reactivemongo.json.ImplicitBSONHandlers._

diff --git a/modules/team/src/main/TeamApi.scala b/modules/team/src/main/TeamApi.scala
@@ -1,6 +1,6 @@
 package lila.team
 
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 
 import actorApi._
 import akka.actor.ActorSelection

diff --git a/modules/team/src/main/TeamRepo.scala b/modules/team/src/main/TeamRepo.scala
@@ -1,7 +1,7 @@
 package lila.team
 
 import org.joda.time.{ DateTime, Period }
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 import play.api.libs.json.Json
 import reactivemongo.api._
 

diff --git a/modules/timeline/src/main/Push.scala b/modules/timeline/src/main/Push.scala
@@ -3,7 +3,7 @@ package lila.timeline
 import akka.actor._
 import akka.pattern.{ ask, pipe }
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 import play.api.libs.json._
 import play.api.templates.Html
 

diff --git a/modules/tournament/src/main/Tournament.scala b/modules/tournament/src/main/Tournament.scala
@@ -1,7 +1,7 @@
 package lila.tournament
 
 import org.joda.time.{ DateTime, Duration }
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 import ornicar.scalalib.Random
 
 import chess.{ Variant, Mode }

diff --git a/modules/tournament/src/main/TournamentApi.scala b/modules/tournament/src/main/TournamentApi.scala
@@ -3,7 +3,7 @@ package lila.tournament
 import akka.actor.{ ActorRef, ActorSelection }
 import akka.pattern.{ ask, pipe }
 import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 import play.api.libs.json._
 import scalaz.NonEmptyList
 

diff --git a/modules/tournament/src/main/TournamentRepo.scala b/modules/tournament/src/main/TournamentRepo.scala
@@ -1,6 +1,6 @@
 package lila.tournament
 
-import org.scala_tools.time.Imports._
+import com.github.nscala_time.time.Imports._
 import play.api.libs.json._
 
 import lila.db.api._

diff --git a/modules/user/src/main/UserRepo.scala b/modules/user/src/main/UserRepo.scala
@@ -209,7 +209,7 @@ object UserRepo {
  import reactivemongo.bson._
  import reactivemongo.core.commands._
  val command = Aggregate(userTube.coll.name, Seq(
- Sort(BSONDocument("_id" -> BSONDocument("$in" -> ids))),
+ Match(BSONDocument("_id" -> BSONDocument("$in" -> ids))),
  Group(BSONBoolean(true))("toints" -> SumField("toints"))
  ))
  userTube.coll.db.command(command) map { stream ⇒

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -31,7 +31,7 @@ object Dependencies {
  }
 
  val scalaz = "org.scalaz" %% "scalaz-core" % "7.0.4"
- val scalalib = "com.github.ornicar" %% "scalalib" % "4.20"
+ val scalalib = "com.github.ornicar" %% "scalalib" % "4.21"
  val config = "com.typesafe" % "config" % "1.0.2"
  val apache = "org.apache.commons" % "commons-lang3" % "3.1"
  val scalaTime = "com.github.nscala-time" %% "nscala-time" % "0.6.0"