bump to play 2.2.0

app/controllers/CurrentUser.java

@@ -2,13 +2,15 @@
 
 import models.User;
 import play.cache.Cache;
+import play.libs.F;
 import play.mvc.Action;
 import play.mvc.Http;
 import play.mvc.Result;
+import play.mvc.SimpleResult;
 
 public class CurrentUser extends Action.Simple {
 
-    public Result call(Http.Context ctx) throws Throwable {
+    public F.Promise<SimpleResult> call(Http.Context ctx) throws Throwable {
         String token = ctx.session().get("token");
         if (token != null) {
             User user = (User)Cache.get(token);

app/controllers/RouteController.java

@@ -88,7 +88,7 @@ public static Result getRouteHtml(String urlFriendlyRegionName, String urlFriend
             return notFound("Region not found");
         }
 
-        return ok(views.html.route.render(route));
+        return ok(views.html.route.render(route, flash()));
     }
 
     private static Route getRoute(String urlFriendlyRegionName, String urlFriendlyRouteName) {

app/views/route.scala.html

@@ -1,4 +1,4 @@
-@(route: Route)
+@(route: Route, flash: play.mvc.Http.Flash)
 
 @import scala.collection.JavaConversions._
 

build.sbt

@@ -0,0 +1,18 @@
+name := "happytrails"
+
+version := "1.0-SNAPSHOT"
+
+libraryDependencies ++= Seq(
+  javaJdbc,
+  javaEbean,
+  cache,
+  "org.webjars" %% "webjars-play" % "2.2.0",
+  "org.webjars" % "bootstrap" % "2.3.1",
+  "postgresql" % "postgresql" % "9.1-901-1.jdbc4",
+  "rome" % "rome" % "1.0",
+  "com.typesafe" %% "play-plugins-mailer" % "2.1.0",
+  "com.amazonaws" % "aws-java-sdk" % "1.3.11",
+  "org.imgscalr" % "imgscalr-lib" % "4.2"
+)
+
+play.Project.playJavaSettings

project/build.properties

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

project/plugins.sbt

@@ -5,4 +5,4 @@ logLevel := Level.Warn
 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")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.0")