Support over Play 2.2

Author: tsuyoshizawa

play2-oauth2-provider/src/main/scala/scalaoauth2/provider/OAuth2Provider.scala

@@ -73,7 +73,7 @@ trait OAuth2Provider extends Results {
    * @return Request is successful then return JSON to client in OAuth 2.0 format.
    *         Request is failed then return BadRequest or Unauthorized status to client with cause into the JSON.
    */
-  def issueAccessToken[A, U](dataHandler: DataHandler[U])(implicit request: play.api.mvc.Request[A]): PlainResult = {
+  def issueAccessToken[A, U](dataHandler: DataHandler[U])(implicit request: play.api.mvc.Request[A]): SimpleResult = {
     TokenEndpoint.handleRequest(request, dataHandler) match {
       case Left(e) if e.statusCode == 400 => responseOAuthError(BadRequest, e)
       case Left(e) if e.statusCode == 401 => responseOAuthError(Unauthorized, e)
@@ -104,15 +104,15 @@ trait OAuth2Provider extends Results {
    * @return Authentication is successful then the response use your API result.
    *         Authentication is failed then return BadRequest or Unauthorized status to client with cause into the JSON.
    */
-  def authorize[A, U](dataHandler: DataHandler[U])(callback: AuthInfo[U] => PlainResult)(implicit request: play.api.mvc.Request[A]): PlainResult = {
+  def authorize[A, U](dataHandler: DataHandler[U])(callback: AuthInfo[U] => SimpleResult)(implicit request: play.api.mvc.Request[A]): SimpleResult = {
     ProtectedResource.handleRequest(request, dataHandler) match {
       case Left(e) if e.statusCode == 400 => responseOAuthError(BadRequest, e)
       case Left(e) if e.statusCode == 401 => responseOAuthError(Unauthorized, e)
       case Right(authInfo) => callback(authInfo)
     }
   }
 
-  protected def responseOAuthError(result: PlainResult, e: OAuthError) = result.withHeaders(
+  protected def responseOAuthError(result: SimpleResult, e: OAuthError) = result.withHeaders(
     "WWW-Authenticate" -> ("Bearer " + toOAuthErrorString(e))
   )
 

project/Build.scala

@@ -5,10 +5,10 @@ object ScalaOAuth2Build extends Build {
 
   lazy val _organization = "com.nulab-inc"
   lazy val _version =  "0.4.0"
-  lazy val _playVersion =  "2.1.0"
+  lazy val _playVersion =  "2.2.0"
 
-  val _scalaVersion = "2.10.2"
-  val _crossScalaVersions = Seq("2.9.3", "2.10.2")
+  val _scalaVersion = "2.10.3"
+  val _crossScalaVersions = Seq("2.9.3", "2.10.3")
 
   lazy val scalaOAuth2Core = Project(
     id = "scala-oauth2-core",
@@ -46,7 +46,7 @@ object ScalaOAuth2Build extends Build {
       scalacOptions ++= _scalacOptions,
       resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/",
       libraryDependencies ++= Seq(
-        "play" %% "play" % _playVersion % "provided"
+        "com.typesafe.play" %% "play" % _playVersion % "provided"
       ),
       publishTo <<= version { (v: String) => _publishTo(v) },
       publishMavenStyle := true,