Bumped play version

core/src/main/scala/jp/t2v/lab/play2/stackc/StackableController.scala

@@ -10,7 +10,7 @@ trait StackableController {
     self: Controller =>
 
   final class StackActionBuilder(params: (RequestAttributeKey[_], Any)*) extends ActionBuilder[RequestWithAttributes] {
-    def invokeBlock[A](req: Request[A], block: (RequestWithAttributes[A]) => Future[SimpleResult]): Future[SimpleResult] = {
+    def invokeBlock[A](req: Request[A], block: (RequestWithAttributes[A]) => Future[Result]): Future[Result] = {
       val request = new RequestWithAttributes(req, new TrieMap[RequestAttributeKey[_], Any] ++= params)
       try {
         cleanup(request, proceed(request)(block))(StackActionExecutionContext(request))
@@ -21,21 +21,21 @@ trait StackableController {
     }
   }
 
-  final def AsyncStack[A](p: BodyParser[A], params: (RequestAttributeKey[_], Any)*)(f: RequestWithAttributes[A] => Future[SimpleResult]): Action[A] = new StackActionBuilder(params: _*).async(p)(f)
-  final def AsyncStack(params: (RequestAttributeKey[_], Any)*)(f: RequestWithAttributes[AnyContent] => Future[SimpleResult]): Action[AnyContent] = new StackActionBuilder(params: _*).async(f)
-  final def AsyncStack(f: RequestWithAttributes[AnyContent] => Future[SimpleResult]): Action[AnyContent] = new StackActionBuilder().async(f)
+  final def AsyncStack[A](p: BodyParser[A], params: (RequestAttributeKey[_], Any)*)(f: RequestWithAttributes[A] => Future[Result]): Action[A] = new StackActionBuilder(params: _*).async(p)(f)
+  final def AsyncStack(params: (RequestAttributeKey[_], Any)*)(f: RequestWithAttributes[AnyContent] => Future[Result]): Action[AnyContent] = new StackActionBuilder(params: _*).async(f)
+  final def AsyncStack(f: RequestWithAttributes[AnyContent] => Future[Result]): Action[AnyContent] = new StackActionBuilder().async(f)
 
-  final def StackAction[A](p: BodyParser[A], params: (RequestAttributeKey[_], Any)*)(f: RequestWithAttributes[A] => SimpleResult): Action[A] = new StackActionBuilder(params: _*).apply(p)(f)
-  final def StackAction(params: (RequestAttributeKey[_], Any)*)(f: RequestWithAttributes[AnyContent] => SimpleResult): Action[AnyContent] = new StackActionBuilder(params: _*).apply(f)
-  final def StackAction(f: RequestWithAttributes[AnyContent] => SimpleResult): Action[AnyContent] = new StackActionBuilder().apply(f)
+  final def StackAction[A](p: BodyParser[A], params: (RequestAttributeKey[_], Any)*)(f: RequestWithAttributes[A] => Result): Action[A] = new StackActionBuilder(params: _*).apply(p)(f)
+  final def StackAction(params: (RequestAttributeKey[_], Any)*)(f: RequestWithAttributes[AnyContent] => Result): Action[AnyContent] = new StackActionBuilder(params: _*).apply(f)
+  final def StackAction(f: RequestWithAttributes[AnyContent] => Result): Action[AnyContent] = new StackActionBuilder().apply(f)
 
-  def proceed[A](request: RequestWithAttributes[A])(f: RequestWithAttributes[A] => Future[SimpleResult]): Future[SimpleResult] = f(request)
+  def proceed[A](request: RequestWithAttributes[A])(f: RequestWithAttributes[A] => Future[Result]): Future[Result] = f(request)
 
   def cleanupOnSucceeded[A](request: RequestWithAttributes[A]): Unit = ()
 
   def cleanupOnFailed[A](request: RequestWithAttributes[A], e: Throwable): Unit = ()
 
-  private def cleanup[A](request: RequestWithAttributes[A], result: Future[SimpleResult])(implicit ctx: ExecutionContext): Future[SimpleResult] = result andThen {
+  private def cleanup[A](request: RequestWithAttributes[A], result: Future[Result])(implicit ctx: ExecutionContext): Future[Result] = result andThen {
     case Success(p) => cleanupOnSucceeded(request)
     case Failure(e) => cleanupOnFailed(request, e)
   }

project/Build.scala

@@ -6,7 +6,7 @@ object StackableControllerProjects extends Build {
 
   lazy val _organization = "jp.t2v"
 
-  lazy val _version = "0.3.0"
+  lazy val _version = "0.4.0-SNAPSHOT"
 
   def _publishTo(v: String) = {
     val nexus = "https://oss.sonatype.org/"
@@ -52,13 +52,13 @@ object StackableControllerProjects extends Build {
       organization := _organization,
       name := "stackable-controller",
       version := _version,
-      scalaVersion := "2.10.3",
+      scalaVersion := "2.10.4",
       publishTo <<= version { (v: String) => _publishTo(v) },
       publishMavenStyle := true,
       resolvers ++= _resolvers,
       libraryDependencies ++= Seq(
           // scope: compile
-          "com.typesafe.play" %% "play" % "2.2.0" % "provided"
+          "com.typesafe.play" %% "play" % "2.3-M1" % "provided"
       ),
       sbtPlugin := false,
       scalacOptions ++= _scalacOptions,
@@ -72,20 +72,20 @@ object StackableControllerProjects extends Build {
   lazy val sampleDependencies = Seq(
     // Add your project dependencies here,
     jdbc,
-    "com.typesafe.play"  %% "play"                      % "2.2.1",
+    "com.typesafe.play"  %% "play"                      % "2.3-M1",
     "com.github.seratch" %% "scalikejdbc"               % "[1.6,)",
     "com.github.seratch" %% "scalikejdbc-interpolation" % "[1.6,)",
     "com.github.seratch" %% "scalikejdbc-play-plugin"   % "[1.6,)",
     "org.slf4j"          %  "slf4j-simple"              % "[1.7,)"
   )
 
   lazy val sample =  play.Project("sample", _version, sampleDependencies, path = file("sample")).settings(
-    scalaVersion := "2.10.3"
+    scalaVersion := "2.10.4"
     // Add your own project settings here
   ) dependsOn(core)
 
   lazy val root = Project(id = "root", base = file(".")).settings(
-    scalaVersion := "2.10.3"
+    scalaVersion := "2.10.4"
   ).aggregate(core, sample) 
 
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.5-M2

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("com.typesafe.play" % "sbt-plugin" % "2.2.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3-M1")