Merge branch 'main' into update/sbt-scalajs-1.15.0

http4s · Mar 1, 2024 · feb39ef · feb39ef
2 parents 75661aa + ab514b4
commit feb39ef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -136,7 +136,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 }}-${{ matrix.project }}
           path: targets.tar
@@ -196,7 +196,7 @@ jobs:
         run: sbt +update
 
       - name: Download target directories (2.13, http4s-sessionJS)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionJS
 
@@ -206,7 +206,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, http4s-sessionNative)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionNative
 
@@ -216,7 +216,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, http4s-sessionJVM)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-sessionJVM
 
@@ -226,7 +226,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (3, http4s-sessionJS)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionJS
 
@@ -236,7 +236,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (3, http4s-sessionNative)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionNative
 
@@ -246,7 +246,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (3, http4s-sessionJVM)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-sessionJVM
 

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.17
+version = 3.8.0
 align.openParenCallSite = true
 align.openParenDefnSite = true
 maxColumn = 120

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.8
+sbt.version=1.9.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.2")
+addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.3")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")