Merge pull request #484 from zarthross/Update-Scala

Update Scala versions

Author: zarthross

Diff for: .github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         java: [1.8, 1.11, 1.14]
-        scala: [2.12.11, 2.13.2]
+        scala: [2.12.12, 2.13.4]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.java }}

Diff for: .github/workflows/mima.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         java: [1.14]
-        scala: [2.12.11, 2.13.2]
+        scala: [2.12.12, 2.13.4]
     steps:
     - uses: actions/checkout@v2
       with:

Diff for: .github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         java: [1.14]
-        scala: [2.12.11, 2.13.2]
+        scala: [2.12.12, 2.13.4]
     steps:
     - uses: actions/checkout@v2
       with:

Diff for: core/src/main/scala/org/http4s/rho/bits/QueryParser.scala

@@ -66,13 +66,13 @@ trait QueryParsers[F[_]] extends FailureResponseOps[F] {
     }
   }
 
-  /** Extract an element from the `Query` using a [[StringParser]] */
+  /** Extract an element from the `Query` using a [[org.http4s.rho.bits.StringParser]] */
   implicit def standardCollector[A](implicit F: Monad[F], p: StringParser[F, A]) = new QueryParser[F, A] {
     override def collect(name: String, params: Params, default: Option[A]): ResultResponse[F, A] = {
       params.get(name) match {
-        case Some(Seq(value, _*)) => p.parse(value)
+        case Some(values) if values.nonEmpty => p.parse(values.head)
 
-        case Some(Seq()) => default match {
+        case Some(_) => default match {
           case Some(defaultValue) => SuccessResponse(defaultValue)
           case None => badRequest(s"Value of query parameter '$name' missing")
         }

Diff for: core/src/main/scala/org/http4s/rho/package.scala

@@ -32,7 +32,7 @@ trait RhoDsl[F[_]]
     * val hello = Root / "hello"
     * }}}
     */
-  def root(): TypedPath[F, HNil] = TypedPath(PathEmpty)
+  def root: TypedPath[F, HNil] = TypedPath(PathEmpty)
 
   def * : CaptureTail.type = CaptureTail
 }

Diff for: core/src/test/scala/org/http4s/rho/CodecRouterSpec.scala

@@ -10,7 +10,7 @@ import scala.collection.compat.immutable.ArraySeq
 class CodecRouterSpec extends Specification {
 
   def bodyAndStatus(resp: Response[IO]): (String, Status) = {
-    val rbody = new String(resp.body.compile.toVector.unsafeRunSync.foldLeft(Array[Byte]())(_ :+ _))
+    val rbody = new String(resp.body.compile.toVector.unsafeRunSync().foldLeft(Array[Byte]())(_ :+ _))
     (rbody, resp.status)
   }
 

Diff for: core/src/test/scala/org/http4s/rho/RequestRunner.scala

@@ -24,7 +24,7 @@ trait RequestRunner {
 
 object RequestRunner {
   def getBody(b: EntityBody[IO]): String = {
-    new String(b.compile.toVector.unsafeRunSync.foldLeft(Array[Byte]())(_ :+ _))
+    new String(b.compile.toVector.unsafeRunSync().foldLeft(Array[Byte]())(_ :+ _))
   }
 }
 

Diff for: hal/src/test/scala/org/http4s/rho/hal/HalDocBuilderSpec.scala

@@ -96,18 +96,18 @@ object ResourceObjectBuilderSpec extends Specification {
             .link("ea:customer", LinkObject("/customers/7809"))
             .content(Map("total" -> 30.00,
               "currency" -> "USD",
-              "status" -> "shipped")).build,
+              "status" -> "shipped")).build(),
           new ResourceObjectBuilder[Map[String, Any], Nothing]()
             .link("self", LinkObject("/orders/124"))
             .link("ea:basket", LinkObject("/baskets/97213"))
             .link("ea:customer", LinkObject("/customers/12369"))
             .content(Map("total" -> 20.00,
               "currency" -> "USD",
-              "status" -> "processing")).build)
+              "status" -> "processing")).build())
         .content(Map(
           "currentlyProcessing" -> 14,
           "shippedToday" -> 20))
-        .build
+        .build()
 
     "build a ResourceObject" in {
       documentBuilder must be equalTo document

Diff for: project/Dependencies.scala

@@ -5,8 +5,8 @@ object Dependencies {
   lazy val http4sVersion = "0.21.14"
   lazy val specs2Version = "4.10.5"
 
-  val scala_213 = "2.13.2"
-  val scala_212 = "2.12.11"
+  val scala_213 = "2.13.4"
+  val scala_212 = "2.12.12"
 
   lazy val http4sServer        = "org.http4s"                 %% "http4s-server"         % http4sVersion
   lazy val http4sDSL           = "org.http4s"                 %% "http4s-dsl"            % http4sVersion