Merge branch 'main' into update/scribe-slf4j-3.15.0

kaizen-solutions · Jul 1, 2024 · 692b413 · 692b413
2 parents d530eb9 + 86ca492
commit 692b413
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,6 +56,9 @@ jobs:
           java-version: 21
           cache: sbt
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Check that workflows are up to date
         run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
 
@@ -114,6 +117,9 @@ jobs:
           java-version: 21
           cache: sbt
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Download target directories (2.12.19)
         uses: actions/download-artifact@v4
         with:

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.1"
+version = "3.8.2"
 maxColumn = 120
 align.preset = most
 align.multiline = false

diff --git a/build.sbt b/build.sbt
@@ -77,7 +77,7 @@ lazy val core =
         val datastaxV = "4.17.0"
 
         val zio                   = "dev.zio"
-        val zioV                  = "2.1.1"
+        val zioV                  = "2.1.5"
         val magnoliaForScala2     = "com.softwaremill.magnolia1_2" %% "magnolia"      % "1.1.10"
         val scalaReflectForScala2 = "org.scala-lang"                % "scala-reflect" % scalaVersion.value
         val magnoliaForScala3     = "com.softwaremill.magnolia1_3" %% "magnolia"      % "1.3.7"
@@ -89,7 +89,7 @@ lazy val core =
             zio                      %% "zio-test"                % zioV     % Test,
             zio                      %% "zio-test-scalacheck"     % zioV     % Test,
             zio                      %% "zio-test-sbt"            % zioV     % Test,
-            "com.dimafeng"           %% "testcontainers-scala"    % "0.41.3" % Test,
+            "com.dimafeng"           %% "testcontainers-scala"    % "0.41.4" % Test,
             "com.outr"               %% "scribe-slf4j"            % "3.15.0" % Test
           )
 
@@ -115,7 +115,7 @@ lazy val zio =
       name := "virgil-zio",
       libraryDependencies ++= {
         val zio  = "dev.zio"
-        val zioV = "2.1.1"
+        val zioV = "2.1.5"
 
         Seq(
           zio %% "zio"         % zioV,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.github.sbt"   % "sbt-github-actions" % "0.23.0")
+addSbtPlugin("com.github.sbt"   % "sbt-github-actions" % "0.24.0")
 addSbtPlugin("org.typelevel"    % "sbt-tpolecat"       % "0.5.1")
 addSbtPlugin("org.scoverage"    % "sbt-scoverage"      % "2.0.11")
 addSbtPlugin("org.scoverage"    % "sbt-coveralls"      % "1.3.11")