update libraries

nulab · Jul 14, 2018 · 5f74b38 · 5f74b38
1 parent 5745629
commit 5f74b38
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 val playVersion = "2.6.7"
 val commonDependenciesInTestScope = Seq(
-  "org.scalatest" %% "scalatest" % "3.0.4" % "test",
+  "org.scalatest" %% "scalatest" % "3.0.5" % "test",
   "ch.qos.logback" % "logback-classic" % "1.2.3" % "test"
 )
 
@@ -13,8 +13,8 @@ lazy val scalaOAuth2ProviderSettings =
   Defaults.coreDefaultSettings ++
     Seq(
       organization := "com.nulab-inc",
-      scalaVersion := "2.12.4",
-      crossScalaVersions := Seq("2.11.11", "2.12.4"),
+      scalaVersion := "2.12.6",
+      crossScalaVersions := Seq("2.11.12", "2.12.6"),
       scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature"),
       scalacOptions ++= unusedWarnings,
       publishTo := {

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.3
+sbt.version=1.1.6
diff --git a/src/test/scala/scalaoauth2/provider/OAuth2ProviderActionBuildersSpec.scala b/src/test/scala/scalaoauth2/provider/OAuth2ProviderActionBuildersSpec.scala
@@ -12,7 +12,7 @@ import play.api.test.FakeRequest
 class OAuth2ProviderActionBuildersSpec extends FlatSpec {
 
   class MyController @Inject() (components: ControllerComponents)
-      extends AbstractController(components) with OAuth2ProviderActionBuilders {
+    extends AbstractController(components) with OAuth2ProviderActionBuilders {
 
     val action = AuthorizedAction(new MockDataHandler) { request =>
       Ok(request.authInfo.user.name)

diff --git a/src/test/scala/scalaoauth2/provider/OAuth2ProviderSpec.scala b/src/test/scala/scalaoauth2/provider/OAuth2ProviderSpec.scala
@@ -23,9 +23,7 @@ class OAuth2ProviderSpec extends FlatSpec {
         expiresIn = Some(3600),
         refreshToken = None,
         scope = None,
-        params = Map.empty
-      )
-    )
+        params = Map.empty))
     map.get("token_type") should contain(JsString("Bearer"))
     map.get("access_token") should contain(JsString("access_token"))
     map.get("expires_in") should contain(JsNumber(3600))
@@ -49,8 +47,7 @@ class OAuth2ProviderSpec extends FlatSpec {
   it should "get parameters from form url encoded body" in {
     val values = Map(
       "id" -> List("1000"),
-      "language" -> List("Scala")
-    )
+      "language" -> List("Scala"))
     val request = FakeRequest(method = "GET", uri = "/", headers = FakeHeaders(), body = AnyContentAsFormUrlEncoded(values))
     val params = TestOAuthProvider.getParam(request)
     params.get("id") should contain(List("1000"))
@@ -60,8 +57,7 @@ class OAuth2ProviderSpec extends FlatSpec {
   it should "get parameters from query string" in {
     val values = Map(
       "id" -> List("1000"),
-      "language" -> List("Scala")
-    )
+      "language" -> List("Scala"))
     val request = FakeRequest(method = "GET", uri = "/?version=2.11", headers = FakeHeaders(), body = AnyContentAsFormUrlEncoded(values))
     val params = TestOAuthProvider.getParam(request)
     params.get("id") should contain(List("1000"))
@@ -72,8 +68,7 @@ class OAuth2ProviderSpec extends FlatSpec {
   it should "get parameters from JSON body" in {
     val json = Json.obj(
       "id" -> 1000,
-      "language" -> "Scala"
-    )
+      "language" -> "Scala")
     val request = FakeRequest(method = "GET", uri = "/", headers = FakeHeaders(), body = AnyContentAsJson(json))
     val params = TestOAuthProvider.getParam(request)
     params.get("id") should contain(List("1000"))