Bump up dependency versions to upgrade to Scala Native 0.5.5 and alig…

…n with zio 2.1.9
zio-archive · Sep 25, 2024 · 94423be · 94423be
1 parent de2cab0
commit 94423be
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['8', '11', '17']
-        scala: ['2.12.17', '2.13.10', '3.3.1']
+        scala: ['2.12.19', '2.13.14', '3.3.3']
         platform: ['JVM', 'JS', 'Native']
     steps:
       - name: Checkout current branch

diff --git a/build.sbt b/build.sbt
@@ -37,10 +37,10 @@ addCommandAlias(
 )
 addCommandAlias(
   "testNative",
-  ";mockNative/compile"
+  ";mockNative/test"
 )
 
-val zioVersion = "2.0.19"
+val zioVersion = "2.1.9"
 
 lazy val root = (project in file("."))
   .aggregate(
@@ -94,9 +94,9 @@ lazy val mockJS = mock.js
 
 lazy val mockNative = mock.native
   .settings(nativeSettings)
-  .settings(libraryDependencies += "org.ekrich" %%% "sjavatime" % "1.1.9")
+  .settings(dottySettings)
 
-lazy val mockTests = crossProject(JSPlatform, JVMPlatform)
+lazy val mockTests = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .in(file("mock-tests"))
   .dependsOn(mock)
   .settings(

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -24,8 +24,8 @@ object BuildHelper {
   val Scala213: String                      = versions("2.13")
   val Scala3: String                        = versions("3.3")
 
-  val SilencerVersion    = "1.7.12"
-  val SjsJavaTimeVersion = "2.3.0"
+  val SilencerVersion    = "1.7.17"
+  val ScalaJavaTimeVersion = "2.6.0"
 
   private val stdOptions = Seq(
     "-deprecation",
@@ -66,7 +66,6 @@ object BuildHelper {
     )
 
   val dottySettings = Seq(
-    crossScalaVersions += Scala3,
     scalacOptions ++= {
       if (scalaVersion.value == Scala3)
         Seq("-noindent", "-Xcheck-macros")
@@ -266,8 +265,8 @@ object BuildHelper {
   )
 
   def jsSettings = Seq(
-    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time"      % SjsJavaTimeVersion,
-    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % SjsJavaTimeVersion,
+    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time"      % ScalaJavaTimeVersion,
+    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % ScalaJavaTimeVersion,
     libraryDependencies += ("org.scala-js" %%% "scalajs-java-securerandom" % "1.0.0").cross(CrossVersion.for3Use2_13),
     scalacOptions ++= {
       if (scalaVersion.value == Scala3) Seq("-scalajs")
@@ -276,10 +275,8 @@ object BuildHelper {
   )
 
   def nativeSettings = Seq(
-    Test / test             := (Test / compile).value,
-    doc / skip              := true,
-    Compile / doc / sources := Seq.empty,
-    crossScalaVersions -= Scala3
+    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time"      % ScalaJavaTimeVersion,
+    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % ScalaJavaTimeVersion
   )
 
   val scalaReflectTestSettings: List[Setting[_]] = List(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.10.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,21 +1,21 @@
-addSbtPlugin("ch.epfl.scala"                     % "sbt-bloop"                     % "1.4.12")
-addSbtPlugin("ch.epfl.scala"                     % "sbt-scalafix"                  % "0.10.4")
-addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"                 % "0.10.0")
+addSbtPlugin("ch.epfl.scala"                     % "sbt-bloop"                     % "1.6.0")
+addSbtPlugin("ch.epfl.scala"                     % "sbt-scalafix"                  % "0.12.1")
+addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"                 % "0.12.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"               % "1.0.1")
-addSbtPlugin("de.heikoseeberger"                 % "sbt-header"                    % "5.6.0")
+addSbtPlugin("com.github.sbt"                    % "sbt-ci-release"                % "1.5.12")
+addSbtPlugin("com.github.cb372"                  % "sbt-explicit-dependencies"     % "0.3.1")
+addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings"              % "3.0.2")
+addSbtPlugin("com.typesafe"                      % "sbt-mima-plugin"               % "1.1.3")
+addSbtPlugin("de.heikoseeberger"                 % "sbt-header"                    % "5.10.0")
 addSbtPlugin("org.portable-scala"                % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject"      % "1.3.2")
-addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.14.0")
-addSbtPlugin("org.scala-native"                  % "sbt-scala-native"              % "0.4.16")
-addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                      % "2.3.0")
-addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"                  % "2.4.6")
+addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.16.0")
+addSbtPlugin("org.scala-native"                  % "sbt-scala-native"              % "0.5.5")
+addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                      % "2.5.4")
+addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"                  % "2.5.2")
 addSbtPlugin("pl.project13.scala"                % "sbt-jcstress"                  % "0.2.0")
-addSbtPlugin("pl.project13.scala"                % "sbt-jmh"                       % "0.4.3")
-addSbtPlugin("com.timushev.sbt"                  % "sbt-updates"                   % "0.6.1")
-addSbtPlugin("dev.zio"                           % "zio-sbt-website"               % "0.3.4")
+addSbtPlugin("pl.project13.scala"                % "sbt-jmh"                       % "0.4.7")
+addSbtPlugin("com.timushev.sbt"                  % "sbt-updates"                   % "0.6.4")
+addSbtPlugin("dev.zio"                           % "zio-sbt-website"               % "0.3.9")
 
-libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.3"
+libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.7"