Update scala.js to 1.10.0

pityka · Apr 30, 2022 · 0f942ca · 0f942ca
1 parent 30e5d19
commit 0f942ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/canvas/index.html b/canvas/index.html
@@ -8,7 +8,7 @@
 
   <div id="plot"></div>
 
-  <script type="text/javascript" src="target/scala-2.13/nspl-canvas-js-opt.js"></script>
+  <script type="text/javascript" src="target/scala-2.13/nspl-canvas-js-fastopt.js"></script>
   <script>
     nsplcanvastest.bind(document.getElementById("plot"));
   </script>

diff --git a/canvas/src/main/scala/org/nspl/canvas.scala b/canvas/src/main/scala/org/nspl/canvas.scala
@@ -5,6 +5,7 @@ import org.scalajs.dom
 import org.scalajs.dom.html
 import scala.collection.mutable.ArrayBuffer
 import scala.scalajs.js
+import java.util.ConcurrentModificationException
 
 private[nspl] case class CanvasRC(
     graphics: CanvasRenderingContext2D,
@@ -201,7 +202,11 @@ object canvasrenderer {
         dom.window.requestAnimationFrame { d =>
           val cb = queuedCallback
           queuedCallback = null
-          cb(d)
+          try {
+            cb(d)
+          } catch {
+            case _: ConcurrentModificationException => ()
+          }
         }
       }
       queuedCallback = body

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
 addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
 
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")