Merge branch 'master' into update/sbt-ghpages-0.8.0

vigoo · Nov 7, 2023 · 96250c3 · 96250c3
2 parents 4faf1c4 + bf5ef3a
commit 96250c3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scala: ['2.13.10', "3.2.2"]
+        scala: ['2.13.12', '3.3.1']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -19,8 +19,8 @@ jobs:
       - name: Coursier cache
         uses: coursier/cache-action@v5
       - name: Build and test
-        if: ${{ matrix.scala == '3.2.2' }}
+        if: ${{ matrix.scala == '3.3.1' }}
         run: sbt ++${{ matrix.scala }} clean desert-core/test desert-coreJS/test desert-akka/test desert-cats/test desert-catsJS/test desert-cats-effect/test desert-cats-effectJS/test desert-zio/test desert-zioJS/test desert-zio-schema/test desert-zio-schemaJS/test desert-shardcake/test
       - name: Build and test
-        if: ${{ matrix.scala != '3.2.2' }}
+        if: ${{ matrix.scala != '3.3.1' }}
         run: sbt ++${{ matrix.scala }} clean coverage test coverageReport && bash <(curl -s https://codecov.io/bash)
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.14
+version = 3.7.15
 
 runner.dialect = scala213source3
 

diff --git a/build.sbt b/build.sbt
@@ -4,11 +4,11 @@ import sbtcrossproject.{CrossProject, CrossType}
 import scoverage.ScoverageKeys.coverageEnabled
 import xerial.sbt.Sonatype._
 
-val scala2 = "2.13.11"
+val scala2 = "2.13.12"
 val scala3 = "3.3.1"
 
-val zioVersion       = "2.0.13"
-val zioSchemaVersion = "0.4.14"
+val zioVersion       = "2.0.19"
+val zioSchemaVersion = "0.4.15"
 
 name := "desert"
 
@@ -153,7 +153,7 @@ lazy val catsEffect = CrossProject("desert-cats-effect", file("desert-cats-effec
   .settings(
     description := "Cats-effect API bindings for desert",
     libraryDependencies ++= Seq(
-      "org.typelevel" %% "cats-effect" % "3.5.1"
+      "org.typelevel" %% "cats-effect" % "3.5.2"
     )
   )
   .jsSettings(coverageEnabled := false)

diff --git a/golden-dataset-generator/build.sbt b/golden-dataset-generator/build.sbt
@@ -4,7 +4,7 @@ name := "golden-dataset-generator"
 
 lazy val commonSettings = Seq(
   organization  := "io.github.vigoo",
-  scalaVersion  := "2.13.11",
+  scalaVersion  := "2.13.12",
   scalacOptions := Seq(
     "-deprecation",
     "-unchecked"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,15 +2,15 @@ addSbtPlugin("org.scoverage"      % "sbt-scoverage"            % "2.0.9")
 addSbtPlugin("com.github.sbt"     % "sbt-ghpages"              % "0.8.0")
 addSbtPlugin("com.timushev.sbt"   % "sbt-updates"              % "0.6.4")
 addSbtPlugin("com.47deg"          % "sbt-microsites"           % "1.3.4")
-addSbtPlugin("org.scalameta"      % "sbt-mdoc"                 % "2.3.7")
+addSbtPlugin("org.scalameta"      % "sbt-mdoc"                 % "2.4.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "1.13.2")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "1.14.0")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"                  % "0.4.6")
 addSbtPlugin("com.github.sbt"     % "sbt-unidoc"               % "0.5.0")
 addSbtPlugin("com.github.sbt"     % "sbt-ci-release"           % "1.5.10")
 addSbtPlugin("org.scalameta"      % "sbt-scalafmt"             % "2.5.2")
 
-libraryDependencies += "org.scalameta" % "scalameta_2.12" % "4.8.10"
+libraryDependencies += "org.scalameta" % "scalameta_2.12" % "4.8.12"
 
 libraryDependencies += "org.scoverage" %% "scalac-scoverage-plugin" % "2.0.11" cross (CrossVersion.full)