aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Pretty <jon.pretty@propensive.com>2018-06-06 14:09:30 +0200
committerGitHub <noreply@github.com>2018-06-06 14:09:30 +0200
commita208e2f57dc0a6e06f4c47540d7a36a152c32caa (patch)
tree158004e1d658a67ef84a99f94928433b1d59c998
parenta59b1e72c9ad076034bde13be1e0f90452b45f20 (diff)
parente7ffd7e1486a04a2d9e5642c35455fdb556d3554 (diff)
downloadmagnolia-a208e2f57dc0a6e06f4c47540d7a36a152c32caa.tar.gz
magnolia-a208e2f57dc0a6e06f4c47540d7a36a152c32caa.tar.bz2
magnolia-a208e2f57dc0a6e06f4c47540d7a36a152c32caa.zip
Merge pull request #100 from xuwei-k/Scala-2.13.0-M4
Scala 2.13.0-M4
-rw-r--r--build.sbt4
-rw-r--r--core/shared/src/main/scala/magnolia.scala3
2 files changed, 3 insertions, 4 deletions
diff --git a/build.sbt b/build.sbt
index 0239960..697b69c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -12,10 +12,10 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
scalaVersion := crossScalaVersions.value.head
)
.jvmSettings(
- crossScalaVersions := "2.12.4" :: "2.13.0-M3" :: "2.11.12" :: Nil
+ crossScalaVersions := "2.12.4" :: "2.13.0-M4" :: "2.11.12" :: Nil
)
.jsSettings(
- crossScalaVersions := "2.12.4" :: "2.11.12" :: Nil
+ crossScalaVersions := "2.12.4" :: "2.13.0-M4" :: "2.11.12" :: Nil
)
.nativeSettings(
crossScalaVersions := "2.11.12" :: Nil
diff --git a/core/shared/src/main/scala/magnolia.scala b/core/shared/src/main/scala/magnolia.scala
index 6001977..1d45fa7 100644
--- a/core/shared/src/main/scala/magnolia.scala
+++ b/core/shared/src/main/scala/magnolia.scala
@@ -15,7 +15,6 @@
package magnolia
import scala.annotation.compileTimeOnly
-import scala.collection.breakOut
import scala.collection.mutable
import scala.language.existentials
import scala.language.higherKinds
@@ -518,7 +517,7 @@ private[magnolia] object CompileTimeState {
(frames.drop(1), frames).zipped.collect {
case (Frame(path, tp1, _), Frame(_, tp2, _))
if !(tp1 =:= tp2) => path
- } (breakOut)
+ }.toList
override def toString: String =
frames.mkString("magnolia stack:\n", "\n", "\n")