diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 4e51d5dfec..435c563f60 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -30,3 +30,6 @@ f52cdbdd18eedf7979c62060ce9c36a948d24d6e # Scala Steward: Reformat with scalafmt 3.7.11 c40dbf3aafd72299a21b38125140249337c83e0f + +# Scala Steward: Reformat with scalafmt 3.7.12 +631454eb718c0c3539cb5296452728d5248f579b diff --git a/.scalafmt.conf b/.scalafmt.conf index ee0c88c17e..cd1202f2e2 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.11 +version = 3.7.12 maxColumn = 140 runner.dialect = scala3 fileOverride { diff --git a/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/openapi/models/OpenapiSchemaType.scala b/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/openapi/models/OpenapiSchemaType.scala index 6deabbbc8a..2ddd7acf78 100644 --- a/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/openapi/models/OpenapiSchemaType.scala +++ b/openapi-codegen/core/src/main/scala/sttp/tapir/codegen/openapi/models/OpenapiSchemaType.scala @@ -288,6 +288,6 @@ object OpenapiSchemaType { Decoder[OpenapiSchemaObject].widen, Decoder[OpenapiSchemaMap].widen, Decoder[OpenapiSchemaArray].widen, - Decoder[OpenapiSchemaEnum].widen, + Decoder[OpenapiSchemaEnum].widen ).reduceLeft(_ or _) } diff --git a/openapi-codegen/core/src/test/scala/sttp/tapir/codegen/BasicGeneratorSpec.scala b/openapi-codegen/core/src/test/scala/sttp/tapir/codegen/BasicGeneratorSpec.scala index 53f900fd67..d41bde3f55 100644 --- a/openapi-codegen/core/src/test/scala/sttp/tapir/codegen/BasicGeneratorSpec.scala +++ b/openapi-codegen/core/src/test/scala/sttp/tapir/codegen/BasicGeneratorSpec.scala @@ -5,7 +5,12 @@ import sttp.tapir.codegen.testutils.CompileCheckTestBase class BasicGeneratorSpec extends CompileCheckTestBase { it should "generate the bookshop example" in { - BasicGenerator.generateObjects(TestHelpers.myBookshopDoc, "sttp.tapir.generated", "TapirGeneratedEndpoints", targetScala3 = false) shouldCompile () + BasicGenerator.generateObjects( + TestHelpers.myBookshopDoc, + "sttp.tapir.generated", + "TapirGeneratedEndpoints", + targetScala3 = false + ) shouldCompile () } }