Merge pull request #513 from jtjeferreira/scala_2.13

scala 2.13 support
eed3si9n · Jul 16, 2019 · 2234d3c · 2234d3c
2 parents 92e8a51 + 8932720
commit 2234d3c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 import Dependencies._
 import Common._
 
-ThisBuild / version := "1.7.1"
+ThisBuild / version := "1.7.2"
 ThisBuild / organization := "org.scalaxb"
 ThisBuild / homepage := Option(url("http://scalaxb.org"))
 ThisBuild / licenses := List("MIT License" -> url("https://github.com/eed3si9n/scalaxb/blob/master/LICENSE"))

diff --git a/cli/src/main/resources/httpclients_gigahorse02.scala.template b/cli/src/main/resources/httpclients_gigahorse02.scala.template
@@ -15,7 +15,7 @@ trait GigahorseHttpClients extends HttpClients {
       .withRequestTimeout(requestTimeout))
 
     def request(in: String, address: java.net.URI, headers: Map[String, String]): String = {
-      val req = url(address.toString).post(in).withHeaders(headers.mapValues(List(_)))
+      val req = url(address.toString).post(in).withHeaders(headers.mapValues(List(_)).toMap)
       Await.result(client.processFull(req, asString), connectionTimeout + requestTimeout)
     }
   }

diff --git a/cli/src/main/resources/httpclients_gigahorse02_async.scala.template b/cli/src/main/resources/httpclients_gigahorse02_async.scala.template
@@ -15,7 +15,7 @@ trait GigahorseHttpClientsAsync extends HttpClientsAsync {
       .withRequestTimeout(requestTimeout))
 
     def request(in: String, address: java.net.URI, headers: Map[String, String])(implicit ec: ExecutionContext): Future[String] = {
-      val req = url(address.toString).post(in).withHeaders(headers.mapValues(List(_)))
+      val req = url(address.toString).post(in).withHeaders(headers.mapValues(List(_)).toMap)
       client.processFull(req, asString)
     }
   }

diff --git a/cli/src/main/resources/scalaxb.scala.template b/cli/src/main/resources/scalaxb.scala.template
@@ -821,14 +821,13 @@ class HexBinary(_vector: Vector[Byte]) extends scala.collection.IndexedSeq[Byte]
 
 object HexBinary {
   def apply(xs: Byte*): HexBinary = {
-    import scala.collection.breakOut
-    val vector: Vector[Byte] = (xs.toIndexedSeq map {x: Byte => x})(breakOut)
+    val vector: Vector[Byte] = xs.toVector
     new HexBinary(vector)
   }
 
   def apply(value: String): HexBinary = {
     val array = DatatypeConverter.parseHexBinary(value)
-    apply(array: _*)
+    apply(array.toSeq: _*)
   }
 
   def unapplySeq(x: HexBinary) = Some(x.vector)
@@ -843,14 +842,13 @@ class Base64Binary(_vector: Vector[Byte]) extends scala.collection.IndexedSeq[By
 
 object Base64Binary {
   def apply(xs: Byte*): Base64Binary = {
-    import scala.collection.breakOut
-    val vector: Vector[Byte] = (xs.toIndexedSeq map {x: Byte => x})(breakOut)
+    val vector: Vector[Byte] = xs.toVector
     new Base64Binary(vector)
   }
 
   def apply(value: String): Base64Binary = {
     val array = DatatypeConverter.parseBase64Binary(value)
-    apply(array: _*)
+    apply(array.toSeq: _*)
   }
 
   def unapplySeq(x: Base64Binary) = Some(x.vector)