Update to sjs-dom 2.0.0 final (#511)

* Update to sjs-dom 2.0.0-RC1 * Formatting * Bump to sjs-dom 2.0.0 final
shadaj · Oct 23, 2021 · b1dd3f4 · b1dd3f4
1 parent 7dc8b6d
commit b1dd3f4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/sbt.yml b/.github/workflows/sbt.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        scalajs: ["0.6.33", "1.0.0"]
+        scalajs: ["0.6.33", "1.5.1"]
         es2015_enabled: ["false", "true"]
     steps:
       - name: Configure git to disable Windows line feeds

diff --git a/history/build.sbt b/history/build.sbt
@@ -2,7 +2,12 @@ enablePlugins(ScalaJSPlugin)
 
 name := "slinky-history"
 
-libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.1.0"
+libraryDependencies += {
+  if (scalaJSVersion.startsWith("0.6."))
+    "org.scala-js" %%% "scalajs-dom" % "1.1.0"
+  else
+    "org.scala-js" %%% "scalajs-dom" % "2.0.0"
+}
 
 scalacOptions ++= {
   if (scalaJSVersion.startsWith("0.6.")) Seq("-P:scalajs:sjsDefinedByDefault")

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -15,7 +15,7 @@ libraryDependencies ++= {
 
 {
   if (scalaJSVersion.startsWith("0.6.")) addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-sjs06" % "0.19.0")
-  else Seq(addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.17.0"))
+  else Seq(addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0"))
 }
 
 libraryDependencies ++= {

diff --git a/web/build.sbt b/web/build.sbt
@@ -2,6 +2,11 @@ enablePlugins(ScalaJSPlugin)
 
 name := "slinky-web"
 
-libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.0.0"
+libraryDependencies += {
+  if (scalaJSVersion.startsWith("0.6."))
+    "org.scala-js" %%% "scalajs-dom" % "1.0.0"
+  else
+    "org.scala-js" %%% "scalajs-dom" % "2.0.0"
+}
 
 scalacOptions -= "-Xfatal-warnings"