Merge branch 'main' into update/sbt-scala3-migrate-0.6.1

zio · Sep 24, 2023 · e219474 · e219474
2 parents f52ea85 + 70aabfc
commit e219474
Show file tree

Hide file tree

Showing 18 changed files with 216 additions and 249 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -94,7 +94,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -187,7 +187,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/build.sbt b/build.sbt
@@ -198,8 +198,8 @@ lazy val zioHttpBenchmarks = (project in file("zio-http-benchmarks"))
       "com.softwaremill.sttp.tapir"   %% "tapir-json-circe"    % "1.5.1",
       "com.softwaremill.sttp.client3" %% "core"                % "3.9.0",
 //      "dev.zio"                     %% "zio-interop-cats"    % "3.3.0",
-      "org.slf4j"                      % "slf4j-api"           % "2.0.7",
-      "org.slf4j"                      % "slf4j-simple"        % "2.0.7",
+      "org.slf4j"                      % "slf4j-api"           % "2.0.9",
+      "org.slf4j"                      % "slf4j-simple"        % "2.0.9",
     ),
   )
   .dependsOn(zioHttp)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,7 @@ object Dependencies {
   val NettyVersion                  = "4.1.93.Final"
   val NettyIncubatorVersion         = "0.0.20.Final"
   val ScalaCompactCollectionVersion = "2.11.0"
-  val ZioVersion                    = "2.0.16"
+  val ZioVersion                    = "2.0.17"
   val ZioCliVersion                 = "0.5.0"
   val ZioSchemaVersion              = "0.4.13"
   val SttpVersion                   = "3.3.18"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,7 +3,7 @@ addSbtPlugin("org.scalameta"      % "sbt-scalafmt"       % "2.5.0")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"            % "0.4.4")
 addSbtPlugin("com.timushev.sbt"   % "sbt-updates"        % "0.6.3")
 addSbtPlugin("io.spray"           % "sbt-revolver"       % "0.10.0")
-addSbtPlugin("com.github.sbt"     % "sbt-github-actions" % "0.15.0")
+addSbtPlugin("com.github.sbt"     % "sbt-github-actions" % "0.16.0")
 addSbtPlugin("ch.epfl.scala"      % "sbt-scala3-migrate" % "0.5.1")
 addSbtPlugin("com.github.sbt"     % "sbt-ci-release"     % "1.5.12")
 addSbtPlugin("dev.zio"            % "zio-sbt-website"    % "0.3.10")

diff --git a/zio-http-cli/src/test/scala/zio/http/endpoint/cli/EndpointGen.scala b/zio-http-cli/src/test/scala/zio/http/endpoint/cli/EndpointGen.scala
@@ -106,7 +106,7 @@ object EndpointGen {
     List(transformOrFail, withDoc, withExamples).map(_.asInstanceOf[Mapper[CliReprOf[Codec[_]], Any]])
 
   def transformOrFail[A] = Mapper[CliReprOf[Codec[A]], Any](
-    (repr, _: Any) => CliRepr(repr.value.transform((x: A) => x, (x: A) => x), repr.repr),
+    (repr, _: Any) => CliRepr(repr.value.transform((x: A) => x)((x: A) => x), repr.repr),
     Gen.empty,
   )
 

diff --git a/zio-http/src/main/scala/zio/http/codec/HeaderCodecs.scala b/zio-http/src/main/scala/zio/http/codec/HeaderCodecs.scala
@@ -29,7 +29,7 @@ private[codec] trait HeaderCodecs {
 
   def header(headerType: HeaderType): HeaderCodec[headerType.HeaderValue] =
     headerCodec(headerType.name, TextCodec.string)
-      .transformOrFailLeft(headerType.parse(_), headerType.render(_))
+      .transformOrFailLeft(headerType.parse(_))(headerType.render(_))
 
   def name[A](name: String)(implicit codec: TextCodec[A]): HeaderCodec[A] =
     headerCodec(name, codec)
@@ -39,20 +39,19 @@ private[codec] trait HeaderCodecs {
     parse: B => A,
     render: A => B,
   )(implicit codec: TextCodec[B]): HeaderCodec[A] =
-    headerCodec(name, codec).transformOrFailLeft(
-      s => Try(parse(s)).toEither.left.map(e => s"Failed to parse header $name: ${e.getMessage}"),
-      render,
-    )
+    headerCodec(name, codec).transformOrFailLeft(s =>
+      Try(parse(s)).toEither.left.map(e => s"Failed to parse header $name: ${e.getMessage}"),
+    )(render)
 
   def nameTransformOption[A, B](name: String, parse: B => Option[A], render: A => B)(implicit
     codec: TextCodec[B],
   ): HeaderCodec[A] =
-    headerCodec(name, codec).transformOrFailLeft(parse(_).toRight(s"Failed to parse header $name"), render)
+    headerCodec(name, codec).transformOrFailLeft(parse(_).toRight(s"Failed to parse header $name"))(render)
 
   def nameTransformOrFail[A, B](name: String, parse: B => Either[String, A], render: A => B)(implicit
     codec: TextCodec[B],
   ): HeaderCodec[A] =
-    headerCodec(name, codec).transformOrFailLeft(parse, render)
+    headerCodec(name, codec).transformOrFailLeft(parse)(render)
 
   final val accept: HeaderCodec[Header.Accept]                 = header(Header.Accept)
   final val acceptEncoding: HeaderCodec[Header.AcceptEncoding] = header(Header.AcceptEncoding)