Skip to content

Commit

Permalink
version 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tsuyoshizawa committed Sep 11, 2016
1 parent 3f4589c commit 30494e4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 31 deletions.
42 changes: 14 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,54 +22,40 @@ and an access token type called [Bearer](http://tools.ietf.org/html/rfc6750).
If you'd like to use this with Play Framework, add "play2-oauth2-provider" to library dependencies of your project.

### Play Framework
#### 2.5

```scala
libraryDependencies ++= Seq(
"com.nulab-inc" %% "play2-oauth2-provider" % "0.18.0"
"com.nulab-inc" %% "play2-oauth2-provider" % "1.0.0"
)
```

#### 2.4

```scala
libraryDependencies ++= Seq(
"com.nulab-inc" %% "play2-oauth2-provider" % "0.16.1"
)
```

#### 2.3

```scala
libraryDependencies ++= Seq(
"com.nulab-inc" %% "play2-oauth2-provider" % "0.14.0"
)
```

#### 2.2

```scala
libraryDependencies ++= Seq(
"com.nulab-inc" %% "play2-oauth2-provider" % "0.7.4"
)
```
Library version | Play version
--------------- | ------------
1.0.0 | 2.5.x
0.16.1 | 2.4.x
0.14.0 | 2.3.x
0.7.4 | 2.2.x

### Akka HTTP
#### 2.4

```scala
libraryDependencies ++= Seq(
"com.nulab-inc" %% "akka-http-oauth2-provider" % "0.18.0"
"com.nulab-inc" %% "akka-http-oauth2-provider" % "1.0.0"
)
```

Library version | Akka HTTP version
--------------- | ------------
1.0.0 | 2.4.x

### Other frameworks

Add "scala-oauth2-core" instead. In this case, you need to implement your own OAuth provider working with web framework you use.
Add `scala-oauth2-core` instead. In this case, you need to implement your own OAuth provider working with web framework you use.

```scala
libraryDependencies ++= Seq(
"com.nulab-inc" %% "scala-oauth2-core" % "0.18.0"
"com.nulab-inc" %% "scala-oauth2-core" % "1.0.0"
)
```

Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
val oauth2ProviderVersion = "0.18.1-SNAPSHOT"
val playVersion = "2.5.6"
val akkaVersion = "2.4.7"
val commonDependenciesInTestScope = Seq(
Expand All @@ -11,7 +10,6 @@ lazy val scalaOAuth2ProviderSettings =
scalariformSettings ++
Seq(
organization := "com.nulab-inc",
version := oauth2ProviderVersion,
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.11.8"),
scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature"),
Expand Down Expand Up @@ -59,6 +57,7 @@ lazy val scalaOAuth2Core = Project(
settings = scalaOAuth2ProviderSettings ++ Seq(
name := "scala-oauth2-core",
description := "OAuth 2.0 server-side implementation written in Scala",
version := "1.0.0",
libraryDependencies ++= commonDependenciesInTestScope
)
)
Expand All @@ -69,6 +68,7 @@ lazy val play2OAuth2Provider = Project(
settings = scalaOAuth2ProviderSettings ++ Seq(
name := "play2-oauth2-provider",
description := "Support scala-oauth2-core library on Playframework Scala",
version := "1.0.0",
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/maven-releases/",
libraryDependencies ++= Seq(
"com.typesafe.play" %% "play" % playVersion % "provided",
Expand All @@ -83,6 +83,7 @@ lazy val akkahttpOAuth2Provider = Project(
settings = scalaOAuth2ProviderSettings ++ Seq(
name := "akka-http-oauth2-provider",
description := "Support scala-oauth2-core library on akka-http",
version := "1.0.0",
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/maven-releases/",
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-http-experimental" % akkaVersion,
Expand All @@ -93,4 +94,3 @@ lazy val akkahttpOAuth2Provider = Project(
) ++ commonDependenciesInTestScope
)
) dependsOn (scalaOAuth2Core % "compile->compile;test->test")

0 comments on commit 30494e4

Please sign in to comment.