Merge branch 'refs/heads/wip/1.4.0'

.travis.yml

@@ -1,7 +1,7 @@
 language: scala
 
 scala:
-  - 2.10.0
+  - 2.10.3
 
 branches:
   only:

notes/1.4.0.markdown

@@ -0,0 +1,4 @@
+- Salat 1.9.4
+- Play 2.2.1
+- Possible breaking change, cappedCollection size and max is now `Long` instead of `Int` #46
+- Change to MongoClient and use MongoClientOptions instead of the now depricated MongoOptions #51

project/Build.scala

@@ -3,26 +3,29 @@ import sbt.Keys._
 
 object ProjectBuild extends Build {
 
-  lazy val buildVersion =  "1.3.0"
+  lazy val buildVersion =  "1.4.0"
 
-  lazy val root = Project(id = "play-plugins-salat", base = file("."), settings = Project.defaultSettings ++ Publish.settings ++ Ls.settings).settings(
+  lazy val root = Project(id = "play-plugins-salat", base = file("."), settings = Project.defaultSettings ++ Publish.settings).settings(
     organization := "se.radley",
     description := "MongoDB Salat plugin for PlayFramework 2",
     version := buildVersion,
-    scalaVersion := "2.10.0",
+    scalaVersion := "2.10.3",
+    scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature"),
     parallelExecution in Test := false,
     testFrameworks += TestFrameworks.Specs2,
 
-    resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/",
-    resolvers += "Typesafe Snapshots" at "http://repo.typesafe.com/typesafe/snapshots/",
-    resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
+    resolvers ++= Seq(
+      "play Repository" at "http://repo.typesafe.com/typesafe/simple/maven-releases/",
+      Resolver.sonatypeRepo("releases"),
+      Resolver.sonatypeRepo("snapshots")
+    ),
 
     libraryDependencies ++= Seq(
-      "play" %% "play" % "2.1.3" % "provided",
-      "play" % "play-exceptions" % "2.1.3" % "provided",
-      "play" %% "play-test" % "2.1.0" % "test",
-      "com.novus" %% "salat" % "1.9.2",
-      "org.mongodb" %% "casbah-gridfs" % "2.6.2"
+      "com.typesafe.play" %% "play" % "2.2.1" % "provided",
+      "com.typesafe.play" % "play-exceptions" % "2.2.1" % "provided",
+      "com.typesafe.play" %% "play-test" % "2.2.1" % "test",
+      "com.novus" %% "salat" % "1.9.4",
+      "org.mongodb" %% "casbah-gridfs" % "2.6.3"
     )
   )
 }
@@ -33,9 +36,9 @@ object Publish {
     publishTo <<= version { (v: String) =>
       val nexus = "https://oss.sonatype.org/"
       if (v.trim.endsWith("SNAPSHOT"))
-        Some("snapshots" at nexus + "content/repositories/snapshots")
+        Some("sonatype snapshots" at nexus + "content/repositories/snapshots")
       else
-        Some("releases"  at nexus + "service/local/staging/deploy/maven2")
+        Some("sonatype releases"  at nexus + "service/local/staging/deploy/maven2")
     },
     publishArtifact in Test := false,
     pomIncludeRepository := { _ => false },
@@ -55,15 +58,3 @@ object Publish {
       </developers>)
   )
 }
-
-object Ls {
-
-  import _root_.ls.Plugin.LsKeys._
-
-  lazy val settings = _root_.ls.Plugin.lsSettings ++ Seq(
-    (description in lsync) := "MongoDB Salat plugin for Play Framework 2.",
-    licenses in lsync <<= licenses,
-    (tags in lsync) := Seq("play", "playframework", "salat", "mongo", "casbah", "object document mapping", "ODM", "mapper"),
-    (docsUrl in lsync) := Some(new URL("https://github.com/leon/play-salat"))
-  )
-}

project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.4
+sbt.version=0.13.0

project/plugins.sbt

@@ -1,11 +1,3 @@
-resolvers ++= Seq(
-  "less is" at "http://repo.lessis.me",
-  "coda" at "http://repo.codahale.com",
-  Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
-)
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.2")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.7")
-
-addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")

sample/project/Build.scala

@@ -8,7 +8,7 @@ object ApplicationBuild extends Build {
     val appVersion      = "1.0"
 
     val appDependencies = Seq(
-      "se.radley" %% "play-plugins-salat" % "1.3.0"
+      "se.radley" %% "play-plugins-salat" % "1.4.0"
     )
 
     val main = play.Project(appName, appVersion, appDependencies).settings(

sample/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.4
+sbt.version=0.13.0

sample/project/plugins.sbt

@@ -9,4 +9,4 @@ resolvers ++= Seq(
 )
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("play" % "sbt-plugin" % "2.1.3")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.0")