[from now] 2013/11/17 17:14:47

diff --git a/.gitignore b/.gitignore
index f29331d..4641cc7 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 # sbt
 /target
 /project/target
-/project/project
+/project/project/target
+/*/target

 # eclipse
 /.project
[from now] 2013/11/17 17:14:51

diff --git a/project/project/Plugins.scala b/project/project/Plugins.scala
new file mode 100644
index 0000000..5fe936d
--- /dev/null
+++ b/project/project/Plugins.scala
@@ -0,0 +1,15 @@
+import sbt._
+import Keys._
+
+object Plugins extends Build {
+  override lazy val projects = Seq(plugins)
+
+  lazy val plugins = Project("plugins", file(".")).settings(
+    logLevel := Level.Warn,
+    resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
+    addSbtPlugin("play" % "sbt-plugin" % "2.2.1")
+    addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1"),
+    addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.2"),
+    addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.2"))
+}
+
[from now] 2013/11/17 17:15:08

diff --git a/project/plugins.sbt b/project/plugins.sbt
deleted file mode 100755
index 8dc219a..0000000
--- a/project/plugins.sbt
+++ /dev/null
@@ -1,21 +0,0 @@
-// Comment to get more information during initialization
-logLevel := Level.Warn
-
-// The Typesafe repository
-resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
-
-// Use the Play sbt plugin for Play projects
-addSbtPlugin("play" % "sbt-plugin" % "2.1.0")
-
-
-resolvers := Seq(
-  "sumito3478 Maven Repository (pull)" at "http://maven.sumito3478.info/",
-  "Typesafe Snapshots" at "http://repo.typesafe.com/typesafe/snapshots",
-  "Maven Repository Mirror" at "http://uk.maven.org/maven2")
-
-externalResolvers <<= resolvers map {
-  rs =>
-    Resolver.withDefaultResolvers(rs, mavenCentral = false)
-}
-
-addSbtPlugin("info.sumito3478" %% "aprikot-sbt" % "0.0.8")
[from now] 2013/11/17 17:16:35

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
new file mode 100644
index 0000000..d51a737
--- /dev/null
+++ b/project/Dependencies.scala
@@ -0,0 +1,74 @@
+import sbt._
+import Keys._
+
+object Dependencies {
+  val apache_snapshots = "Apache Snapshots" at "https://repository.apache.org/content/groups/snapshots"
+
+  val typesafe_releases = "TypeSafe Releases" at "http://repo.typesafe.com/typesafe/releases"
+
+  val h2 = "com.h2database" % "h2" % "1.3.174"
+
+  val shapeless = "com.chuusai" % "shapeless" % "2.0.0-M1" cross CrossVersion.full
+
+  val commons_io = "commons-io" % "commons-io" % "2.5-SNAPSHOT" changing()
+
+  val commons_collections = "commons-collections" % "commons-collections" % "3.2.1"
+
+  val postgresql = "org.postgresql" % "postgresql" % "9.3-1100-jdbc41"
+
+  val scalalogging = "com.typesafe" %% "scalalogging-slf4j" % "1.0.1"
+
+  val logback = "ch.qos.logback" % "logback-classic" % "1.0.13"
+
+  val scalatest = "org.scalatest" %% "scalatest" % "2.0"
+
+  val Seq(util_collection) = Seq("collection").map(a => "com.twitter" %% s"util-$a" % "6.7.0")
+
+  val Seq(akka_actor, akka_remote, akka_kernel) = Seq("actor", "remote", "kernel").map(a => "com.typesafe.akka" %% s"akka-$a" % "2.2.3")
+
+  val reflections = "org.reflections" % "reflections" % "0.9.8"
+
+  val high_scale_lib = "com.github.stephenc.high-scale-lib" % "high-scale-lib" % "1.1.4"
+
+  val netty = "io.netty" % "netty" % "3.7.0.Final"
+
+  val snappy = "org.iq80.snappy" % "snappy" % "0.3"
+
+  val json4s = "org.json4s" %% "json4s-native" % "3.2.5"
+
+  val Seq(dispatch_core, dispatch_json4s) = Seq("core", "json4s-native").map(a => "net.databinder.dispatch" %% s"dispatch-$a" % "0.11.0")
+
+  val async_http_client = "com.ning" % "async-http-client" % "1.7.21"
+
+  val argonaut = "io.argonaut" %% "argonaut" % "6.0.1"
+
+  val Seq(play_json) = Seq("json").map(a => "com.typesafe.play" %% s"play-$a" % "2.2.1")
+
+  def settings = Seq(
+    resolvers ++= Seq(
+      typesafe_releases,
+      apache_snapshots),
+    libraryDependencies ++= Seq(
+      play_json,
+      async_http_client,
+      json4s,
+      dispatch_core,
+      dispatch_json4s,
+      snappy,
+      netty,
+      high_scale_lib,
+      reflections,
+      akka_kernel,
+      akka_remote,
+      akka_actor,
+      scalatest % "test",
+      util_collection,
+      logback,
+      scalalogging,
+      commons_collections,
+      postgresql,
+      commons_io,
+      shapeless,
+      h2))
+
+}
\ No newline at end of file
[from now] 2013/11/17 17:18:31

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index d51a737..b46728c 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -42,14 +42,11 @@ object Dependencies {

   val argonaut = "io.argonaut" %% "argonaut" % "6.0.1"

-  val Seq(play_json) = Seq("json").map(a => "com.typesafe.play" %% s"play-$a" % "2.2.1")
-
-  def settings = Seq(
-    resolvers ++= Seq(
+  val resolvers = Seq(
       typesafe_releases,
-      apache_snapshots),
-    libraryDependencies ++= Seq(
-      play_json,
+      apache_snapshots)
+
+  val libraryDependencies =  Seq(
       async_http_client,
       json4s,
       dispatch_core,
[from now] 2013/11/17 17:20:23

diff --git a/project/Build.scala b/project/Build.scala
index 6ea3862..21441f0 100755
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -2,18 +2,14 @@ import sbt._
 import Keys._
 import play.Project._

-import info.sumito3478.aprikot.sbt._
-
-object ApplicationBuild extends Build {
+object Build extends Build {

   val appName = "aprikot-cms"
-  val appVersion = "0.0.1-SNAPSHOT"
+  val appVersion = "0.1.0-SNAPSHOT"

   val appDependencies = Seq(
-    "info.sumito3478" %% "aprikot" % "0.3.+",
-    "com.micronautics" % "securesocial" % "2.1.0" withSources (),
     jdbc,
-    anorm)
+    anorm) ++ Dependencies.libraryDependencies

   val main = play.Project(
     appName,
[from now] 2013/11/17 17:35:54

diff --git a/project/Build.scala b/project/Build.scala
index 21441f0..329b033 100755
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -3,7 +3,6 @@ import Keys._
 import play.Project._

 object Build extends Build {
-
   val appName = "aprikot-cms"
   val appVersion = "0.1.0-SNAPSHOT"
[from now] 2013/11/17 17:36:25

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index b46728c..7d57757 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -66,6 +66,5 @@ object Dependencies {
       postgresql,
       commons_io,
       shapeless,
-      h2))
-
-}
\ No newline at end of file
+      h2)
+}
[from now] 2013/11/17 17:36:38

diff --git a/project/build.properties b/project/build.properties
index 66ad72c..0974fce 100755
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.13.0
[from now] 2013/11/17 17:36:41

diff --git a/project/project/Plugins.scala b/project/project/Plugins.scala
index 5fe936d..2d213e0 100644
--- a/project/project/Plugins.scala
+++ b/project/project/Plugins.scala
@@ -6,8 +6,8 @@ object Plugins extends Build {

   lazy val plugins = Project("plugins", file(".")).settings(
     logLevel := Level.Warn,
-    resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
-    addSbtPlugin("play" % "sbt-plugin" % "2.2.1")
+    resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/",
+    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.1"),
     addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1"),
     addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.2"),
     addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.2"))
[from now] 2013/11/17 17:36:46

diff --git a/project/Build.scala b/project/Build.scala
index 329b033..8d12407 100755
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -10,13 +10,24 @@ object Build extends Build {
     jdbc,
     anorm) ++ Dependencies.libraryDependencies

-  val main = play.Project(
-    appName,
-    appVersion,
-    appDependencies).settings(StandardProject.newSettings: _*).settings(
-      resolvers += Resolver.url(
-        "play-plugin-releases",
-        new URL("http://repo.scala-sbt.org/scalasbt/sbt-plugin-releases"))(
-          Resolver.ivyStylePatterns))
+  import scalariform.formatter.preferences._
+  import com.typesafe.sbt.SbtScalariform
+  lazy val scalariformSettings = SbtScalariform.scalariformSettings ++ Seq(
+    SbtScalariform.ScalariformKeys.preferences := FormattingPreferences()
+      .setPreference(DoubleIndentClassDeclaration, true))

+  val playSettings = Seq(
+    resolvers += Resolver.url(
+      "play-plugin-releases",
+      new URL("http://repo.scala-sbt.org/scalasbt/sbt-plugin-releases"))(
+        Resolver.ivyStylePatterns))
+
+  val aprikotSettings = playSettings ++ scalariformSettings ++ Seq(
+    scalacOptions ++= Seq(
+      "-target:jvm-1.7",
+      "-deprecation",
+      "-feature",
+      "-unchecked"))
+
+  val main = play.Project(appName, appVersion, appDependencies).settings(aprikotSettings: _*)
 }