Tests pass for 2.13

Author: fdietze

build.sbt

@@ -31,6 +31,7 @@ val sharedSettings = Seq(
           Nil
       case _ => Nil
     }),
+
 )
 
 lazy val scalarx = crossProject(JSPlatform, JVMPlatform)
@@ -43,13 +44,18 @@ lazy val scalarx = crossProject(JSPlatform, JVMPlatform)
       "com.github.julien-truffaut" %%% "monocle-core" % monocleVersion,
       "com.github.julien-truffaut" %%% "monocle-macro" % monocleVersion % "test",
       "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
-
+      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.1.2",
       "com.lihaoyi" %%% "utest" % "0.6.9" % "test",
       "com.lihaoyi" %% "acyclic" % acyclicVersion % "provided"
     ),
+
     addCompilerPlugin("com.lihaoyi" %% "acyclic" % acyclicVersion),
     testFrameworks += new TestFramework("utest.runner.Framework"),
     autoCompilerPlugins := true,
+  /* scalafixDependencies in ThisBuild += "org.scala-lang.modules" %% "scala-collection-migrations" % "2.1.1", */
+  /* scalacOptions ++= List("-Yrangepos", "-P:semanticdb:synthetics:on"), */
+  /* addCompilerPlugin(scalafixSemanticdb), */
+  /* scalacOptions += "-Yrangepos", */
 
     // Sonatype
     publishTo := Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"),

project/build.sbt

@@ -8,3 +8,6 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.9")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
+
+
+/* addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.6") */

scalarx/shared/src/main/scala/rx/Rx.scala

@@ -5,6 +5,7 @@ import rx.opmacros.Factories
 import scala.annotation.unchecked.uncheckedVariance
 import scala.collection.mutable
 import scala.util.Try
+import scala.collection.compat._
 
 /**
   * A reactive value of type [[T]]. Keeps track of triggers and
@@ -125,7 +126,7 @@ object Rx {
   private[rx] implicit val ordering: Ordering[Dynamic[_]] = Ordering.by[Rx.Dynamic[_], Int](-_.depth)
 
   @inline private[rx] def doRecalcCopy(rxs: Iterable[Rx.Dynamic[_]], obs: Iterable[Obs]): Unit = {
-    doRecalcMutable(rxs.to[mutable.PriorityQueue], obs.to[mutable.Set])
+    doRecalcMutable(rxs.to(mutable.PriorityQueue), obs.to(mutable.Set))
   }
   private[rx] def doRecalcMutable(queue: mutable.PriorityQueue[Rx.Dynamic[_]], observers: mutable.Set[Obs]): Unit = {
     val seen = mutable.Set.empty[Rx.Dynamic[_]]

scalarx/shared/src/main/scala/rx/Var.scala

@@ -1,7 +1,8 @@
 package rx
 
 import scala.util.{Success, Try}
-import scala.collection.{breakOut, mutable}
+import scala.collection.mutable
+import scala.collection.compat._
 
 trait Var[T] extends Rx[T] {
   def update(newValue: T): Unit
@@ -40,8 +41,8 @@ object Var {
   def set(args: Assignment[_]*): Unit = {
     args.foreach(_.set())
     Rx.doRecalcMutable(
-      args.flatMap(_.v.downStream)(breakOut),
-      args.flatMap(_.v.observers)(breakOut)
+      args.iterator.flatMap(_.v.downStream).to(mutable.PriorityQueue),
+      args.iterator.flatMap(_.v.observers).to(mutable.Set)
     )
   }