Merge branch 'master' into update/cats-4.0.26

Author: adamw

.git-blame-ignore-revs

@@ -84,3 +84,9 @@ da85b978db204adf6f236bfd4e453628a6d4cdda
 
 # Scala Steward: Reformat with scalafmt 3.11.1
 17d6746ee877b9c0e3f15602b6aed0dfa16e1691
+
+# Scala Steward: Reformat with scalafmt 3.11.2
+400127d53ebf236548879443afc5b8d08afdd625
+
+# Scala Steward: Reformat with scalafmt 3.11.3
+0bc1a9c10d5f2a78304535fdcb74b60c43c70839

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.11.1
+version = 3.11.3
 maxColumn = 140
 runner.dialect = scala213source3
 fileOverride {

README.md

@@ -139,7 +139,7 @@ val booksListingRequest: Request[DecodeResult[Either[String, List[Book]]]] =
 Add the following dependency:
 
 ```sbt
-"com.softwaremill.sttp.tapir" %% "tapir-core" % "1.13.26"
+"com.softwaremill.sttp.tapir" %% "tapir-core" % "1.13.27"
 ```
 
 Then, import:

build.sbt

@@ -415,21 +415,23 @@ val clientTestServerSettings = Seq(
   })
 )
 
-lazy val superMatrixSettings = Seq((Compile / unmanagedSourceDirectories) ++= {
-  val allCombos = List("js", "jvm", "native").combinations(2).toList
-  val dis =
-    virtualAxes.value.collectFirst { case p: VirtualAxis.PlatformAxis =>
-      p.directorySuffix
-    }.get
-
-  allCombos
-    .filter(_.contains(dis))
-    .map { suff =>
-      val suffixes = "scala" + suff.mkString("-", "-", "")
-
-      (Compile / sourceDirectory).value / suffixes
-    }
-})
+lazy val superMatrixSettings = Seq(
+  (Compile / unmanagedSourceDirectories) ++= {
+    val allCombos = List("js", "jvm", "native").combinations(2).toList
+    val dis =
+      virtualAxes.value.collectFirst { case p: VirtualAxis.PlatformAxis =>
+        p.directorySuffix
+      }.get
+
+    allCombos
+      .filter(_.contains(dis))
+      .map { suff =>
+        val suffixes = "scala" + suff.mkString("-", "-", "")
+
+        (Compile / sourceDirectory).value / suffixes
+      }
+  }
+)
 
 lazy val clientTestServer = (projectMatrix in file("client/testserver"))
   .settings(commonSettings)
@@ -475,7 +477,7 @@ lazy val core: ProjectMatrix = (projectMatrix in file("core"))
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((3, _)) =>
-          Seq("com.softwaremill.magnolia1_3" %%% "magnolia" % "1.3.21")
+          Seq("com.softwaremill.magnolia1_3" %%% "magnolia" % "1.3.22")
         case _ =>
           Seq(
             "com.softwaremill.magnolia1_2" %%% "magnolia" % "1.1.14",
@@ -2282,7 +2284,7 @@ lazy val openapiCodegenCore: ProjectMatrix = (projectMatrix in file("openapi-cod
       scalaTestPlusScalaCheck.value % Test,
       "com.47deg" %% "scalacheck-toolbox-datetime" % "0.7.0" % Test,
       "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % "2.38.16" % Test,
-      "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.38.17" % Provided
+      "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.39.0" % Provided
     )
   )
   .dependsOn(core % Test, circeJson % Test, jsoniterScala % Test, zioJson % Test)

core/src/test/scala/sttp/tapir/EndpointTest.scala

@@ -486,7 +486,12 @@ class EndpointTest extends AnyFlatSpec with EndpointTestExtensions with Matchers
       .mapInTo[EndpointTestFixtures.NestedWrapper]: PublicEndpoint[EndpointTestFixtures.NestedWrapper, Unit, Unit, Any]
     endpoint
       .in(query[String]("q1"))
-      .mapInTo[EndpointTestFixtures.Inner.DoublyNestedWrapper]: PublicEndpoint[EndpointTestFixtures.Inner.DoublyNestedWrapper, Unit, Unit, Any]
+      .mapInTo[EndpointTestFixtures.Inner.DoublyNestedWrapper]: PublicEndpoint[
+      EndpointTestFixtures.Inner.DoublyNestedWrapper,
+      Unit,
+      Unit,
+      Any
+    ]
     endpoint
       .in(query[String]("q1"))
       .mapInTo[ClassNestedFixtures.NestedWrapper]: PublicEndpoint[ClassNestedFixtures.NestedWrapper, Unit, Unit, Any]

doc/generator/sbt-openapi-codegen.md

@@ -58,6 +58,8 @@ openapiPackageDependencies            Map.empty[String, String]            Allow
                                                                            to a Map[String, Seq[String]] in the near future to permit multiple 'inheritance', and there may be bugs in the implementation.
 openapiSeperateFilesForModels         false                                When true, models will be written to individual files under $pkg.models, with type aliases and helpers living under `package.scala` in a package object
 openapiAlwaysGenerateParamSupport     false                                When true, all enums will be generated with param & json support, even if not used in those positions. This is useful for definitions that will be reused with `openapiPackageDependencies`
+openapiAddDisambiguationCodes         false                                When true, if multiple status codes in same group (i.e. all error, or all success) return the same schema, they will be paired with a status code object as (T, StatusCode).
+                                                                           'Default' codes will map to an additional StatusCode output. When false, the type will remain a T and default codes will be treated as 400s.
 ===================================== ==================================== ==================================================================================================
 ```
 

examples/src/main/scala/sttp/tapir/examples/observability/OpenTelemetryTracingExample.scala

@@ -3,8 +3,8 @@
 //> using dep com.softwaremill.sttp.tapir::tapir-netty-server-sync:1.11.18
 //> using dep com.softwaremill.sttp.tapir::tapir-json-circe:1.11.18
 //> using dep com.softwaremill.sttp.tapir::tapir-opentelemetry-tracing:1.13.26
-//> using dep io.opentelemetry:opentelemetry-exporter-otlp:1.63.0
-//> using dep io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.63.0
+//> using dep io.opentelemetry:opentelemetry-exporter-otlp:1.64.0
+//> using dep io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.64.0
 //> using dep ch.qos.logback:logback-classic:1.5.17
 
 package sttp.tapir.examples.observability

examples/src/main/scala/sttp/tapir/examples/observability/ZIOpenTelemetryExample.scala

@@ -5,9 +5,9 @@
 //> using dep com.softwaremill.sttp.tapir::tapir-zio-http-server:1.13.26
 //> using dep com.softwaremill.sttp.tapir::tapir-zio-opentelemetry:1.13.26
 //> using dep dev.zio::zio-opentelemetry:3.1.17
-//> using dep io.opentelemetry:opentelemetry-sdk:1.63.0
-//> using dep io.opentelemetry:opentelemetry-exporter-otlp:1.63.0
-//> using dep io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.63.0
+//> using dep io.opentelemetry:opentelemetry-sdk:1.64.0
+//> using dep io.opentelemetry:opentelemetry-exporter-otlp:1.64.0
+//> using dep io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.64.0
 
 package sttp.tapir.examples.observability
 

generated-doc/out/client/http4s.md

@@ -3,7 +3,7 @@
 Add the dependency:
 
 ```scala
-"com.softwaremill.sttp.tapir" %% "tapir-http4s-client" % "1.13.26"
+"com.softwaremill.sttp.tapir" %% "tapir-http4s-client" % "1.13.27"
 ```
 
 To interpret an endpoint definition as an `org.http4s.Request[F]`, import:

generated-doc/out/client/play.md

@@ -6,13 +6,13 @@ See the [Play framework documentation](https://www.playframework.com/documentati
 For **Play 3.0**, add the dependency:
 
 ```scala
-"com.softwaremill.sttp.tapir" %% "tapir-play-client" % "1.13.26"
+"com.softwaremill.sttp.tapir" %% "tapir-play-client" % "1.13.27"
 ```
 
 For **Play 2.9**, add
 
 ```scala
-"com.softwaremill.sttp.tapir" %% "tapir-play29-client" % "1.13.26"
+"com.softwaremill.sttp.tapir" %% "tapir-play29-client" % "1.13.27"
 ```
 
 instead. Furthermore, replace all uses of `sttp.capabilities.pekko.PekkoStreams` in the following code snippets with `sttp.capabilities.akka.AkkaStreams`.