Merge branch 'main' into update/sbt-scalafix-0.11.1

Dwolla · Jan 26, 2024 · ce065d3 · ce065d3
2 parents f32d0d3 + 97f9344
commit ce065d3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8
@@ -75,7 +75,7 @@ jobs:
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
           path: targets.tar
@@ -98,7 +98,7 @@ jobs:
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8
@@ -109,7 +109,7 @@ jobs:
         run: sbt +update
 
       - name: Download target directories (2.13)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
 
@@ -119,7 +119,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
 
@@ -169,7 +169,7 @@ jobs:
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8
@@ -198,7 +198,7 @@ jobs:
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11

diff --git a/project/AsyncUtilsBuildPlugin.scala b/project/AsyncUtilsBuildPlugin.scala
@@ -61,7 +61,7 @@ object AsyncUtilsBuildPlugin extends AutoPlugin {
   private val SCALA_2_12 = "2.12.18"
   private val Scala2Versions: Seq[String] = Seq(SCALA_2_13, SCALA_2_12)
 
-  private val CatsEffect3V = "3.5.2"
+  private val CatsEffect3V = "3.5.3"
   private val CatsTaglessV: String = "0.15.0"
   private val libthriftV: String = "0.10.0"
 
@@ -182,8 +182,8 @@ object AsyncUtilsBuildPlugin extends AutoPlugin {
         moduleName := name.value + s"-$v",
         libraryDependencies ++= {
           Seq(
-            "org.tpolecat" %% "natchez-core" % "0.3.4",
-            "org.tpolecat" %% "natchez-mtl" % "0.3.4",
+            "org.tpolecat" %% "natchez-core" % "0.3.5",
+            "org.tpolecat" %% "natchez-mtl" % "0.3.5",
             "com.comcast" %% "ip4s-core" % "3.4.0",
             "org.typelevel" %% "cats-mtl" % "1.4.0",
             "io.zipkin.finagle2" %% "zipkin-finagle-http" % "22.4.0",

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.5.4")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.4")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.5.4")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.6.5")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.6.5")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.6.5")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
-addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.1")
+addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.2")