Merge branch 'series/0.24' into update/series/0.24/scala3-library-3.3.3

http4s · May 28, 2024 · 1a802c8 · 1a802c8
2 parents 3b4d659 + 413ed33
commit 1a802c8
Show file tree

Hide file tree

Showing 10 changed files with 840 additions and 119 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -123,7 +123,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
@@ -183,7 +183,7 @@ jobs:
         run: sbt +update
 
       - 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
 
@@ -193,7 +193,7 @@ jobs:
           rm targets.tar
 
       - 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
 
@@ -203,7 +203,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (3)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-3
 

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.8.0
+version = 3.8.1
 
 style = default
 

diff --git a/build.sbt b/build.sbt
@@ -4,12 +4,12 @@ ThisBuild / developers := List(
 )
 
 val Scala213 = "2.13.12"
-ThisBuild / crossScalaVersions := Seq("2.12.18", Scala213, "3.3.3")
+ThisBuild / crossScalaVersions := Seq("2.12.19", Scala213, "3.3.3")
 ThisBuild / scalaVersion := Scala213
 
 lazy val root = project.in(file(".")).aggregate(prometheusMetrics).enablePlugins(NoPublishPlugin)
 
-val http4sVersion = "0.23.25"
+val http4sVersion = "0.23.26"
 val prometheusVersion = "0.16.0"
 val munitVersion = "0.7.29"
 val munitCatsEffectVersion = "1.0.7"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.2")
+addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.3")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.2")
		addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.3")