Scala 2.13.0-M4

.travis.yml

@@ -6,12 +6,17 @@ jdk:
 scala:
   - 2.12.6
   - 2.11.12
-  - 2.13.0-M3
+  - 2.13.0-M4
 
 env:
   - SBT_TASK=core/test
   - SBT_TASK=docs/tut
 
+matrix:
+  exclude:
+  - scala: 2.13.0-M4
+    env: SBT_TASK=docs/tut
+
 script:
   - sbt ++$TRAVIS_SCALA_VERSION $SBT_TASK
 

build.sbt

@@ -8,6 +8,7 @@ lazy val core = project
     compileOrder := CompileOrder.JavaThenScala,
     libraryDependencies ++= Seq(
       typesafeConfig,
+      scalaCollectionCompact,
       scalaReflect.value % "provided",
       lombok % "test"
     ),

core/src/main/scala/configs/ConfigError.scala

@@ -23,7 +23,7 @@ final case class ConfigError(head: ConfigError.Entry, tail: Vector[ConfigError.E
   def entries: Vector[ConfigError.Entry] =
     head +: tail
 
-  def messages: Seq[String] =
+  def messages: collection.Seq[String] =
     entries.map(_.messageWithPath)
 
   def +(that: ConfigError): ConfigError =

core/src/main/scala/configs/ConfigReader.scala

@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit
 import java.{lang => jl, math => jm, time => jt, util => ju}
 import scala.annotation.compileTimeOnly
 import scala.collection.JavaConverters._
-import scala.collection.generic.CanBuildFrom
+import scala.collection.compat._
 import scala.concurrent.duration.{Duration, FiniteDuration}
 
 trait ConfigReader[A] {
@@ -198,11 +198,11 @@ sealed abstract class ConfigReaderInstances extends ConfigReaderInstances0 {
     }
 
 
-  implicit def cbfJListConfigReader[F[_], A](implicit C: ConfigReader[ju.List[A]], cbf: CanBuildFrom[Nothing, A, F[A]]): ConfigReader[F[A]] =
-    C.map(_.asScala.to[F])
+  implicit def cbfJListConfigReader[F[_], A](implicit C: ConfigReader[ju.List[A]], F: Factory[A, F[A]]): ConfigReader[F[A]] =
+    C.map(c => F.fromSpecific(c.asScala))
 
-  implicit def cbfJMapConfigReader[M[_, _], A, B](implicit C: ConfigReader[ju.Map[A, B]], cbf: CanBuildFrom[Nothing, (A, B), M[A, B]]): ConfigReader[M[A, B]] =
-    C.map(_.asScala.to[({type F[_] = M[A, B]})#F])
+  implicit def cbfJMapConfigReader[M[_, _], A, B](implicit C: ConfigReader[ju.Map[A, B]], F: Factory[(A, B), M[A, B]]): ConfigReader[M[A, B]] =
+    C.map(c => F.fromSpecific(c.asScala))
 
 
   implicit def optionConfigReader[A](implicit A: ConfigReader[A]): ConfigReader[Option[A]] =

core/src/main/scala/configs/ConfigUtil.scala

@@ -27,7 +27,7 @@ object ConfigUtil {
   def joinPath(element: String, elements: String*): String =
     Impl.joinPath(element +: elements: _*)
 
-  def joinPath(elements: Seq[String]): String =
+  def joinPath(elements: collection.Seq[String]): String =
     Impl.joinPath(elements.asJava)
 
   def splitPath(path: String): List[String] =

core/src/main/scala/configs/Result.scala

@@ -16,7 +16,7 @@
 
 package configs
 
-import scala.collection.generic.CanBuildFrom
+import scala.collection.compat._
 
 sealed abstract class Result[+A] extends Product with Serializable {
 
@@ -241,10 +241,10 @@ object Result {
   }
 
 
-  def traverse[F[X] <: TraversableOnce[X], A, B, That](fa: F[A])(f: A => Result[B])(implicit cbf: CanBuildFrom[F[A], B, That]): Result[That] =
-    fa.foldLeft(successful(cbf(fa)))((rb, a) => apply2(rb, f(a))(_ += _)).map(_.result())
+  def traverse[F[X] <: IterableOnce[X], A, B, That](fa: F[A])(f: A => Result[B])(implicit bf: BuildFrom[F[A], B, That]): Result[That] =
+    fa.foldLeft(successful(bf.newBuilder(fa)))((rb, a) => apply2(rb, f(a))(_ += _)).map(_.result())
 
-  def sequence[F[X] <: TraversableOnce[X], A, That](fa: F[Result[A]])(implicit cbf: CanBuildFrom[F[Result[A]], A, That]): Result[That] =
+  def sequence[F[X] <: IterableOnce[X], A, That](fa: F[Result[A]])(implicit cbf: BuildFrom[F[Result[A]], A, That]): Result[That] =
     traverse(fa)(x => x)
 
 

core/src/main/scala/configs/aliases.scala

@@ -44,10 +44,10 @@ object ConfigList {
 
   def empty: ConfigList = ConfigValueFactory.fromIterable(Nil.asJava)
 
-  def fromSeq(seq: Seq[Any]): Result[ConfigList] =
+  def fromSeq(seq: collection.Seq[Any]): Result[ConfigList] =
     Result.Try(ConfigValueFactory.fromIterable(seq.asJava))
 
-  def fromSeq(seq: Seq[Any], originDescription: String): Result[ConfigList] =
+  def fromSeq(seq: collection.Seq[Any], originDescription: String): Result[ConfigList] =
     Result.Try(ConfigValueFactory.fromIterable(seq.asJava, originDescription))
 
 }

core/src/main/scala/configs/macros/Construct.scala

@@ -94,7 +94,7 @@ trait Construct {
           case d: MethodSymbol if d.isSynthetic => (encodedName(d), d)
         }.collect {
           case (n, d) if n.startsWith(p) => (n.drop(pn).toInt - 1, ModuleMethod(mod, d))
-        }(collection.breakOut)
+        }.toMap
       case _ => Map.empty
     }
 

core/src/main/scala/configs/macros/StringConverterMacro.scala

@@ -24,8 +24,9 @@ class StringConverterMacro(val c: blackbox.Context) {
 
   def enumValueStringConverter[A <: Enumeration : WeakTypeTag]: Tree = {
     val A = weakTypeOf[A].termSymbol.asModule
+    // https://github.com/scala/bug/issues/10906
     q"""
-      val m = $A.values.map(a => (a.toString, a)).toMap
+      val m = ($A.values: _root_.scala.Predef.Set[$A.Value]).map(a => (a.toString, a)).toMap
       _root_.configs.StringConverter.fromString { s =>
         _root_.configs.Result.fromOption(m.get(s)) {
           _root_.configs.ConfigError(

core/src/main/scala/configs/syntax/package.scala

@@ -49,7 +49,7 @@ package object syntax {
     def extract[A](implicit A: ConfigReader[A]): Result[A] =
       A.extractValue(self)
 
-    def withComments(comments: Seq[String]): ConfigValue =
+    def withComments(comments: collection.Seq[String]): ConfigValue =
       self.withOrigin(self.origin().withComments(comments.asJava))
 
   }
@@ -62,13 +62,13 @@ package object syntax {
     def +:[A](value: A)(implicit A: ConfigWriter[A]): ConfigList =
       ConfigList.fromSeq(A.write(value) +: self.asScala).value
 
-    def ++[A](values: Seq[A])(implicit A: ConfigWriter[A]): ConfigList =
+    def ++[A](values: collection.Seq[A])(implicit A: ConfigWriter[A]): ConfigList =
       ConfigList.fromSeq(self.asScala ++ values.map(A.write)).value
 
     def ++(list: ConfigList): ConfigList =
       ConfigList.fromSeq(self.asScala ++ list.asScala).value
 
-    def withComments(comments: Seq[String]): ConfigList =
+    def withComments(comments: collection.Seq[String]): ConfigList =
       self.withOrigin(self.origin().withComments(comments.asJava))
 
   }
@@ -81,7 +81,7 @@ package object syntax {
     def -[A](key: A)(implicit A: StringConverter[A]): ConfigObject =
       self.withoutKey(A.toString(key))
 
-    def ++[A: StringConverter, B: ConfigWriter](kvs: Seq[(A, B)]): ConfigObject =
+    def ++[A: StringConverter, B: ConfigWriter](kvs: collection.Seq[(A, B)]): ConfigObject =
       kvs.foldLeft(self)(_ + _)
 
     def ++[A: StringConverter, B: ConfigWriter](kvs: Map[A, B]): ConfigObject =
@@ -90,7 +90,7 @@ package object syntax {
     def ++(obj: ConfigObject): ConfigObject =
       obj.asScala.foldLeft(self)(_ + _)
 
-    def withComments(comments: Seq[String]): ConfigObject =
+    def withComments(comments: collection.Seq[String]): ConfigObject =
       self.withOrigin(self.origin().withComments(comments.asJava))
 
   }

core/src/test/scala/configs/testutil/instance/collection.scala

@@ -19,7 +19,7 @@ package configs.testutil.instance
 import configs.testutil.instance.string._
 import java.{lang => jl, util => ju}
 import scala.collection.JavaConverters._
-import scala.collection.generic.CanBuildFrom
+import scala.collection.compat._
 import scalaprops.Gen
 import scalaz.{Equal, Order, std}
 
@@ -45,8 +45,8 @@ object collection {
     listEqual[A].contramap(_.asScala.toList)
 
 
-  implicit def mapGen[M[_, _], A: Gen, B: Gen](implicit cbf: CanBuildFrom[Nothing, (A, B), M[A, B]]): Gen[M[A, B]] =
-    Gen.mapGen[A, B].map(_.to[({type F[_] = M[A, B]})#F])
+  implicit def mapGen[M[_, _], A: Gen, B: Gen](implicit F: Factory[(A, B), M[A, B]]): Gen[M[A, B]] =
+    Gen.mapGen[A, B].map(F.fromSpecific)
 
   implicit def mapEqual[M[X, Y] <: scala.collection.Map[X, Y], A: Order, B: Equal]: Equal[M[A, B]] =
     std.map.mapEqual[A, B].contramap(m => m.toMap)

project/Common.scala

@@ -20,12 +20,13 @@ object Common extends AutoPlugin {
       "org.scala-lang" % "scala-reflect" % scalaVersion.value
     }
 
+    val scalaCollectionCompact = "org.scala-lang.modules" %% "scala-collection-compat" % "0.1.1"
   }
 
   override lazy val projectSettings: Seq[Setting[_]] = Seq(
     scalaVersion := "2.12.6",
-    crossScalaVersions := Seq("2.12.6", "2.11.12", "2.13.0-M3"),
-    scalapropsVersion := "0.5.4",
+    crossScalaVersions := Seq("2.12.6", "2.11.12", "2.13.0-M4"),
+    scalapropsVersion := "0.5.5",
     scalacOptions ++= Seq(
       "-deprecation",
       "-unchecked",