0.2.1: support for Scala 2.13.0. Some tests using Quill disabled until they get on 2.13 as well0.2.1

Small typos

There were pair of really inconsequential typos in the documentation.

.

7 files changed, 11 insertions, 11 deletions

diff --git a/cask/src/cask/internal/DispatchTrie.scala b/cask/src/cask/internal/DispatchTrie.scala
index 952c39b..9f1a9c3 100644
--- a/cask/src/cask/internal/DispatchTrie.scala
+++ b/cask/src/cask/internal/DispatchTrie.scala
@@ -2,10 +2,10 @@ package cask.internal
 import collection.mutable
 object DispatchTrie{
   def construct[T](index: Int,
-                   inputs: Seq[(IndexedSeq[String], T, Boolean)]): DispatchTrie[T] = {
-    val continuations = mutable.Map.empty[String, mutable.Buffer[(IndexedSeq[String], T, Boolean)]]
+                   inputs: collection.Seq[(collection.IndexedSeq[String], T, Boolean)]): DispatchTrie[T] = {
+    val continuations = mutable.Map.empty[String, mutable.Buffer[(collection.IndexedSeq[String], T, Boolean)]]
 
-    val terminals = mutable.Buffer.empty[(IndexedSeq[String], T, Boolean)]
+    val terminals = mutable.Buffer.empty[(collection.IndexedSeq[String], T, Boolean)]
 
     for((path, endPoint, allowSubpath) <- inputs) {
       if (path.length < index) () // do nothing
diff --git a/cask/src/cask/internal/Router.scala b/cask/src/cask/internal/Router.scala
index 64af4cd..4b11811 100644
--- a/cask/src/cask/internal/Router.scala
+++ b/cask/src/cask/internal/Router.scala
@@ -65,7 +65,7 @@ object Router{
         }
       }
 
-      if (missing.nonEmpty || unknown.nonEmpty) Result.Error.MismatchedArguments(missing, unknown.toSeq)
+      if (missing.nonEmpty || unknown.nonEmpty) Result.Error.MismatchedArguments(missing.toSeq, unknown.toSeq)
       else {
         try invoke0(
           target,
diff --git a/cask/src/cask/internal/Util.scala b/cask/src/cask/internal/Util.scala
index 431944a..3f7ab61 100644
--- a/cask/src/cask/internal/Util.scala
+++ b/cask/src/cask/internal/Util.scala
@@ -61,7 +61,7 @@ object Util {
     *
     * Written imperatively for performance since it's used all over the place.
     */
-  def splitPath(p: String): IndexedSeq[String] = {
+  def splitPath(p: String): collection.IndexedSeq[String] = {
     val pLength = p.length
     var i = 0
     while(i < pLength && p(i) == '/') i += 1
@@ -92,7 +92,7 @@ object Util {
     trace.toString
   }
   def softWrap(s: String, leftOffset: Int, maxWidth: Int) = {
-    val oneLine = s.lines.mkString(" ").split(' ')
+    val oneLine = s.linesIterator.mkString(" ").split(' ')
 
     lazy val indent = " " * leftOffset
 
diff --git a/cask/src/cask/main/ErrorMsgs.scala b/cask/src/cask/main/ErrorMsgs.scala
index 0d6f8c6..254f4e0 100644
--- a/cask/src/cask/main/ErrorMsgs.scala
+++ b/cask/src/cask/main/ErrorMsgs.scala
@@ -44,7 +44,7 @@ object ErrorMsgs {
       for((lhs, rhs) <- args)
         yield {
           val lhsPadded = lhs.padTo(leftColWidth, ' ')
-          val rhsPadded = rhs.lines.mkString("\n")
+          val rhsPadded = rhs.linesIterator.mkString("\n")
           s"$leftIndentStr  $lhsPadded  $rhsPadded"
         }
     val mainDocSuffix = main.doc match{
diff --git a/cask/src/cask/main/Main.scala b/cask/src/cask/main/Main.scala
index e12683f..88d7a61 100644
--- a/cask/src/cask/main/Main.scala
+++ b/cask/src/cask/main/Main.scala
@@ -44,7 +44,7 @@ abstract class BaseMain{
     .map { method =>
       method -> DispatchTrie.construct[(Routes, Routes.EndpointMetadata[_])](0,
         for ((route, metadata) <- routeList if metadata.endpoint.methods.contains(method))
-        yield (Util.splitPath(metadata.endpoint.path): IndexedSeq[String], (route, metadata), metadata.endpoint.subpath)
+        yield (Util.splitPath(metadata.endpoint.path): collection.IndexedSeq[String], (route, metadata), metadata.endpoint.subpath)
       )
     }.toMap
 
diff --git a/cask/src/cask/main/Routes.scala b/cask/src/cask/main/Routes.scala
index 1a74b87..a4660a9 100644
--- a/cask/src/cask/main/Routes.scala
+++ b/cask/src/cask/main/Routes.scala
@@ -12,7 +12,7 @@ object Routes{
                                  entryPoint: EntryPoint[T, _])
   case class RoutesEndpointsMetadata[T](value: EndpointMetadata[T]*)
   object RoutesEndpointsMetadata{
-    implicit def initialize[T] = macro initializeImpl[T]
+    implicit def initialize[T]: RoutesEndpointsMetadata[T] = macro initializeImpl[T]
     implicit def initializeImpl[T: c.WeakTypeTag](c: Context): c.Expr[RoutesEndpointsMetadata[T]] = {
       import c.universe._
       val router = new cask.internal.Router[c.type](c)
diff --git a/cask/src/cask/model/Params.scala b/cask/src/cask/model/Params.scala
index 270c190..cb0730b 100644
--- a/cask/src/cask/model/Params.scala
+++ b/cask/src/cask/model/Params.scala
@@ -17,10 +17,10 @@ case class Request(exchange: HttpServerExchange, remainingPathSegments: Seq[Stri
     Util.transferTo(data, baos)
     baos.toByteArray
   }
-  lazy val queryParams: Map[String, Seq[String]] = {
+  lazy val queryParams: Map[String, collection.Seq[String]] = {
     exchange.getQueryParameters.asScala.mapValues(_.asScala.toArray.toSeq).toMap
   }
-  lazy val headers: Map[String, Seq[String]] = {
+  lazy val headers: Map[String, collection.Seq[String]] = {
     exchange.getRequestHeaders.asScala
       .map{ header => header.getHeaderName.toString.toLowerCase -> header.asScala }
       .toMap