Update Scala JS and Scala Native (zio#6821)

* Update Scala JS and Scala Native * .cross(CrossVersion.for3Use2_13) * Update sbt * Scala 3.1.2 * Use dottySettings for testTestsJS (removes -Xfatal-warnings)
IMax153 · May 20, 2022 · e8fa653 · e8fa653
1 parent 09bbc53
commit e8fa653
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -87,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scala: ['2.11.12', '2.12.15', '2.13.8', '3.1.1']
+        scala: ['2.11.12', '2.12.15', '2.13.8', '3.1.2']
         platform: ['JVM']
     steps:
     - name: Checkout current branch

diff --git a/build.sbt b/build.sbt
@@ -285,7 +285,7 @@ lazy val test = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(macroExpansionSettings)
   .settings(
     libraryDependencies ++= Seq(
-      ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1")
+      ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2")
         .cross(CrossVersion.for3Use2_13)
     )
   )
@@ -298,13 +298,13 @@ lazy val testJS = test.js
   .settings(dottySettings)
   .settings(
     libraryDependencies ++= List(
-      "io.github.cquiroz" %%% "scala-java-time"      % "2.4.0-M1",
-      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.4.0-M1"
+      "io.github.cquiroz" %%% "scala-java-time"      % "2.4.0-M3",
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.4.0-M3"
     )
   )
 lazy val testNative = test.native
   .settings(nativeSettings)
-  .settings(libraryDependencies += "org.ekrich" %%% "sjavatime" % "1.1.5")
+  .settings(libraryDependencies += "org.ekrich" %%% "sjavatime" % "1.1.9")
 
 lazy val testTests = crossProject(JSPlatform, JVMPlatform)
   .in(file("test-tests"))
@@ -319,7 +319,13 @@ lazy val testTests = crossProject(JSPlatform, JVMPlatform)
   .enablePlugins(BuildInfoPlugin)
 
 lazy val testTestsJVM = testTests.jvm.settings(dottySettings)
-lazy val testTestsJS  = testTests.js.settings(dottySettings)
+lazy val testTestsJS = testTests.js
+  .settings(dottySettings)
+  .settings(
+    libraryDependencies ++= List(
+      ("org.scala-js" %%% "scalajs-java-securerandom" % "1.0.0").cross(CrossVersion.for3Use2_13)
+    )
+  )
 
 lazy val testMagnolia = crossProject(JVMPlatform, JSPlatform)
   .in(file("test-magnolia"))
@@ -590,7 +596,7 @@ lazy val benchmarks = project.module
   )
 
 lazy val jsdocs = project
-  .settings(libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.0.0")
+  .settings(libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.0.0").cross(CrossVersion.for3Use2_13))
   .enablePlugins(ScalaJSPlugin)
 
 val http4sV     = "0.23.6"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.1
+sbt.version=1.6.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,17 +1,18 @@
-addSbtPlugin("ch.epfl.scala"                     % "sbt-bloop"                     % "1.4.9")
-addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"                 % "0.10.0")
-addSbtPlugin("com.eed3si9n"                      % "sbt-unidoc"                    % "0.4.3")
-addSbtPlugin("com.github.sbt"                    % "sbt-ci-release"                % "1.5.9")
+addSbtPlugin("ch.epfl.scala"                     % "sbt-bloop"                     % "1.5.0")
+addSbtPlugin("ch.epfl.scala"                     % "sbt-scalafix"                  % "0.10.0")
+addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"                 % "0.11.0")
+addSbtPlugin("com.github.sbt"                    % "sbt-unidoc"                    % "0.5.0")
+addSbtPlugin("com.github.sbt"                    % "sbt-ci-release"                % "1.5.10")
 addSbtPlugin("com.github.cb372"                  % "sbt-explicit-dependencies"     % "0.2.16")
-addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings"              % "3.0.0")
-addSbtPlugin("com.typesafe"                      % "sbt-mima-plugin"               % "0.8.1")
-addSbtPlugin("de.heikoseeberger"                 % "sbt-header"                    % "5.6.0")
-addSbtPlugin("org.portable-scala"                % "sbt-scala-native-crossproject" % "1.1.0")
-addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject"      % "1.1.0")
-addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.8.0")
-addSbtPlugin("org.scala-native"                  % "sbt-scala-native"              % "0.4.3")
-addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                      % "2.2.24")
-addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"                  % "2.4.3")
+addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings"              % "3.0.2")
+addSbtPlugin("com.typesafe"                      % "sbt-mima-plugin"               % "1.1.0")
+addSbtPlugin("de.heikoseeberger"                 % "sbt-header"                    % "5.7.0")
+addSbtPlugin("org.portable-scala"                % "sbt-scala-native-crossproject" % "1.2.0")
+addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject"      % "1.2.0")
+addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.10.0")
+addSbtPlugin("org.scala-native"                  % "sbt-scala-native"              % "0.4.4")
+addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                      % "2.3.2")
+addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"                  % "2.4.6")
 addSbtPlugin("pl.project13.scala"                % "sbt-jcstress"                  % "0.2.0")
 addSbtPlugin("pl.project13.scala"                % "sbt-jmh"                       % "0.4.3")