Skip to content

Commit e4c491d

Browse files
author
Mikołaj Jakubowski
committed
fixes Play Framework version for Scala 2.10.4
1 parent 7071af3 commit e4c491d

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ You should follow three steps below to work with Playframework.
7979
* Access to an authorized resource
8080

8181
First, define your own controller with mixining ```OAuth2Provider``` trait provided by this library to issue access token.
82-
Asynchronous result is used in your controller then you can use ```OAuth2AsyncProvider```, which supports returning ```Future[SimpleResult]```.
82+
Asynchronous result is used in your controller then you can use ```OAuth2AsyncProvider```, which supports returning ```Future[Result]```.
8383

8484
```scala
8585
import scalaoauth2.provider._

project/Build.scala

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@ import Keys._
44
object ScalaOAuth2Build extends Build {
55

66
lazy val _organization = "com.nulab-inc"
7-
lazy val _version = "0.7.2"
8-
def _playVersion(version: String) = version match {
9-
case "2.11.1" => "2.3.0"
10-
case _ => "2.2.3"
11-
}
7+
lazy val _version = "0.7.3-SNAPSHOT"
8+
lazy val _playVersion = "2.3.2"
129

13-
val _scalaVersion = "2.10.3"
14-
val _crossScalaVersions = Seq("2.10.3", "2.11.1")
10+
val _scalaVersion = "2.10.4"
11+
val _crossScalaVersions = Seq("2.10.4", "2.11.1")
1512

1613
val commonDependenciesInTestScope = Seq(
1714
"org.scalatest" %% "scalatest" % "2.2.0" % "test"
@@ -59,7 +56,7 @@ object ScalaOAuth2Build extends Build {
5956
description := "Support scala-oauth2-core library on Playframework Scala",
6057
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/maven-releases/",
6158
libraryDependencies ++= Seq(
62-
"com.typesafe.play" %% "play" % _playVersion(scalaVersion.value) % "provided"
59+
"com.typesafe.play" %% "play" % _playVersion % "provided"
6360
) ++ commonDependenciesInTestScope
6461
)
6562
) dependsOn(scalaOAuth2Core)

0 commit comments

Comments
 (0)