From 9a4b082b92b578c2f76f3c66fddc2408b04e932d Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Tue, 19 Mar 2013 04:57:45 +0100 Subject: [PATCH] tweak sbt project --- project/Build.scala | 18 +++++++----------- project/Dependencies.scala | 1 - 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 4f9bbc205a..b0767d04a4 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -11,17 +11,15 @@ object ApplicationBuild extends Build { settings = buildSettings ++ Seq( libraryDependencies := Seq( scalaz, scalalib, hasher, config, apache, scalaTime, - csv, jgit, actuarius, scalastic, findbugs, - reactivemongo), + csv, jgit, actuarius, scalastic, findbugs), templatesImport ++= Seq( // "lila.app.game.{ DbGame, DbPlayer, Pov }", - "lila.user.User", + "lila.user.{ User, Context }", // "lila.app.security.Permission", // "lila.app.templating.Environment._", // "lila.app.ui", - // "lila.app.http.Context", "lila.common.paginator.Paginator") - )) dependsOn (api, user, wiki) aggregate (scalachess, api, common, http, db, user, wiki) + )) dependsOn (api, user, wiki) aggregate (scalachess, api, common, http, db, user, wiki, websocket, notification) lazy val api = project("api", Seq(common, db, user, security, wiki)).settings( libraryDependencies := provided( @@ -51,8 +49,7 @@ object ApplicationBuild extends Build { ) lazy val security = project("security", Seq(common, db, http, user)).settings( - libraryDependencies ++= provided( - playApi, reactivemongo, playReactivemongo) + libraryDependencies ++= provided(playApi, reactivemongo, playReactivemongo) ) lazy val wiki = project("wiki", Seq(common, db)).settings( @@ -60,15 +57,14 @@ object ApplicationBuild extends Build { playApi, reactivemongo, playReactivemongo, jgit, actuarius, guava) ) - // lazy val notification = project("notification", Seq(common, user)).settings( - // libraryDependencies ++= provided(playApi) - // ) + lazy val notification = project("notification", Seq(common, user, websocket)).settings( + libraryDependencies ++= provided(playApi) + ) lazy val websocket = project("websocket", Seq(common, memo)).settings( libraryDependencies ++= provided(playApi) ) - lazy val scalachess = project("scalachess").settings( libraryDependencies ++= Seq(hasher) ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 93c6aa02ea..dd932f3d61 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -22,7 +22,6 @@ object Dependencies { } val scalaz = "org.scalaz" %% "scalaz-core" % "6.0.4" - val salat = "com.novus" % "salat-core_2.9.2" % "1.9.1" val scalalib = "com.github.ornicar" %% "scalalib" % "3.3" val config = "com.typesafe" % "config" % "1.0.0" val apache = "org.apache.commons" % "commons-lang3" % "3.1"