Scala 2.13.0-RC1 (#128)

* chore(deps): upgrade Scala to 2.13.0-RC1

* fix: `Unit` companion object is not allowed in source; instead, use `()` for the unit value

* fix: warnigns -> symbol literal is deprecated; use Symbol() instead

* fix: warnigns -> Passing an explicit array value to a Scala varargs method is deprecated (since 2.13.0) and will result in a defensive copy; Use the more efficient non-copying ArraySeq.unsafeWrapArray or an explicit toIndexedSeq call

Author: masahitojp

.travis.yml

@@ -2,7 +2,7 @@ language: scala
 scala:
   - 2.12.8
   - 2.11.12
-  - 2.13.0-M5
+  - 2.13.0-RC1
 jdk:
   - oraclejdk8
   - openjdk11

build.sbt

@@ -1,5 +1,5 @@
 val commonDependenciesInTestScope = Seq(
-  "org.scalatest" %% "scalatest" % "3.0.6-SNAP4" % "test",
+  "org.scalatest" %% "scalatest" % "3.0.8-RC2" % "test",
   "ch.qos.logback" % "logback-classic" % "1.2.3" % "test"
 )
 
@@ -12,7 +12,7 @@ lazy val scalaOAuth2ProviderSettings =
     Seq(
       organization := "com.nulab-inc",
       scalaVersion := "2.12.8",
-      crossScalaVersions := Seq("2.12.8", "2.11.12", "2.13.0-M5"),
+      crossScalaVersions := Seq("2.12.8", "2.11.12", "2.13.0-RC1"),
       scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature"),
       scalacOptions ++= unusedWarnings,
       publishTo := {

src/main/scala/scalaoauth2/provider/AccessTokenFetcher.scala

@@ -55,7 +55,7 @@ object AuthHeader extends AccessTokenFetcher {
         (key, URLDecoder.decode(value.replaceFirst("\"$", ""), "UTF-8"))
       }
 
-      Map(pairs: _*)
+      Map(pairs.toIndexedSeq: _*)
     } else {
       Map.empty[String, String]
     }

src/test/scala/scalaoauth2/provider/AuthorizationCodeSpec.scala

@@ -25,7 +25,7 @@ class AuthorizationCodeSpec extends FlatSpec with ScalaFutures with OptionValues
       override def deleteAuthCode(code: String): Future[Unit] = {
         Thread.sleep(300)
         codeDeleted = true
-        Future.successful(Unit)
+        Future.successful(())
       }
     })
 

src/test/scala/scalaoauth2/provider/MockDataHandler.scala

@@ -24,7 +24,7 @@ class MockDataHandler extends DataHandler[User] {
 
   override def refreshAccessToken(authInfo: AuthInfo[User], refreshToken: String): Future[AccessToken] = Future.successful(AccessToken("", Some(""), Some(""), Some(0L), new Date()))
 
-  override def deleteAuthCode(code: String): Future[Unit] = Future.successful(Unit)
+  override def deleteAuthCode(code: String): Future[Unit] = Future.successful(())
 }
 
 trait User {

src/test/scala/scalaoauth2/provider/ProtectedResourceSpec.scala

@@ -26,7 +26,7 @@ class ProtectedResourceSpec extends FlatSpec with ScalaFutures {
       Map("username" -> Seq("user"), "password" -> Seq("pass"), "scope" -> Seq("all")))
 
     val dataHandler = successfulProtectedResourceHandler()
-    ProtectedResource.handleRequest(request, dataHandler).map(_ should be('right))
+    ProtectedResource.handleRequest(request, dataHandler).map(_ should be(Symbol("right")))
   }
 
   it should "be handled request with token into body" in {
@@ -35,7 +35,7 @@ class ProtectedResourceSpec extends FlatSpec with ScalaFutures {
       Map("access_token" -> Seq("token1"), "username" -> Seq("user"), "password" -> Seq("pass"), "scope" -> Seq("all")))
 
     val dataHandler = successfulProtectedResourceHandler()
-    ProtectedResource.handleRequest(request, dataHandler).map(_ should be('right))
+    ProtectedResource.handleRequest(request, dataHandler).map(_ should be(Symbol("right")))
   }
 
   it should "be lost expired" in {

src/test/scala/scalaoauth2/provider/RequestParameterSpec.scala

@@ -23,13 +23,13 @@ class RequestParameterSpec extends FlatSpec {
   it should "fetch only oauth token parameter" in {
     val result = RequestParameter.fetch(createRequest(Some("token1"), None))
     result.token should be("token1")
-    result.params should be('empty)
+    result.params should be(Symbol("empty"))
   }
 
   it should "fetch only access token parameter" in {
     val result = RequestParameter.fetch(createRequest(None, Some("token2")))
     result.token should be("token2")
-    result.params should be('empty)
+    result.params should be(Symbol("empty"))
   }
 
   it should "fetch with another parameter" in {

src/test/scala/scalaoauth2/provider/TokenEndPointSpec.scala

@@ -32,7 +32,7 @@ class TokenEndPointSpec extends FlatSpec with ScalaFutures {
         "password" -> new Password())
     }.handleRequest(request, dataHandler)
 
-    whenReady(f) { result => result should be('right) }
+    whenReady(f) { result => result should be(Symbol("right")) }
   }
 
   it should "be error if grant type doesn't exist" in {
@@ -110,7 +110,7 @@ class TokenEndPointSpec extends FlatSpec with ScalaFutures {
         "password" -> passwordNoCred)
     }.handleRequest(request, dataHandler)
 
-    whenReady(f) { result => result should be('right) }
+    whenReady(f) { result => result should be(Symbol("right")) }
   }
 
   it should "be invalid client if client information is wrong" in {