diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index f5c59e71..6c462c26 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -5,4 +5,6 @@ 0d4c0197766486922e32a707d5d2fc9760d9f528 # eikek: Run scalafix to organize imports -57e3d43ba8025acd521d2e65de80ba9c13fbdb13 \ No newline at end of file +57e3d43ba8025acd521d2e65de80ba9c13fbdb13 +# Scala Steward: Reformat with scalafmt 3.8.2 +9cc3dd838b39afa97ddb76987d070f35f9bd36b8 diff --git a/.scalafmt.conf b/.scalafmt.conf index f61edd33..420a6bd4 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.1" +version = "3.8.2" preset = default align.preset = some diff --git a/build.sbt b/build.sbt index a7dbb8ca..90b9ccde 100644 --- a/build.sbt +++ b/build.sbt @@ -480,9 +480,12 @@ lazy val commonSettings = Seq( // Format: on organizationName := "Swiss Data Science Center (SDSC)", startYear := Some(java.time.LocalDate.now().getYear), - licenses += ("Apache-2.0", new URI( - "https://www.apache.org/licenses/LICENSE-2.0.txt" - ).toURL), + licenses += ( + "Apache-2.0", + new URI( + "https://www.apache.org/licenses/LICENSE-2.0.txt" + ).toURL + ), headerLicense := Some( HeaderLicense.Custom( s"""|Copyright ${java.time.LocalDate.now().getYear} Swiss Data Science Center (SDSC) diff --git a/modules/config-values/src/main/scala/io/renku/search/config/ConfigValues.scala b/modules/config-values/src/main/scala/io/renku/search/config/ConfigValues.scala index 4a6c7d6c..c71e3797 100644 --- a/modules/config-values/src/main/scala/io/renku/search/config/ConfigValues.scala +++ b/modules/config-values/src/main/scala/io/renku/search/config/ConfigValues.scala @@ -86,7 +86,8 @@ object ConfigValues extends ConfigDecoders: renv(s"${prefix}_HTTP_SERVER_BIND_ADDRESS").default("0.0.0.0").as[Ipv4Address] val port = renv(s"${prefix}_HTTP_SERVER_PORT").default(defaultPort.value.toString).as[Port] - val shutdownTimeout = renv(s"${prefix}_HTTP_SHUTDOWN_TIMEOUT").default("30s").as[Duration] + val shutdownTimeout = + renv(s"${prefix}_HTTP_SHUTDOWN_TIMEOUT").default("30s").as[Duration] (bindAddress, port, shutdownTimeout).mapN(HttpServerConfig.apply) val jwtVerifyConfig: ConfigValue[Effect, JwtVerifyConfig] = { diff --git a/modules/http4s-borer/src/main/scala/io/renku/search/http/borer/Http4sJsonCodec.scala b/modules/http4s-borer/src/main/scala/io/renku/search/http/borer/Http4sJsonCodec.scala index d1f28402..1f6fe007 100644 --- a/modules/http4s-borer/src/main/scala/io/renku/search/http/borer/Http4sJsonCodec.scala +++ b/modules/http4s-borer/src/main/scala/io/renku/search/http/borer/Http4sJsonCodec.scala @@ -23,6 +23,7 @@ import org.http4s.* trait Http4sJsonCodec: given Encoder[Uri] = Encoder.forString.contramap(_.renderString) - given Decoder[Uri] = Decoder.forString.mapEither(s => Uri.fromString(s).left.map(_.getMessage)) + given Decoder[Uri] = + Decoder.forString.mapEither(s => Uri.fromString(s).left.map(_.getMessage)) object Http4sJsonCodec extends Http4sJsonCodec diff --git a/modules/http4s-commons/src/main/scala/io/renku/search/http/routes/OperationRoutes.scala b/modules/http4s-commons/src/main/scala/io/renku/search/http/routes/OperationRoutes.scala index 3e71e03d..e8aad861 100644 --- a/modules/http4s-commons/src/main/scala/io/renku/search/http/routes/OperationRoutes.scala +++ b/modules/http4s-commons/src/main/scala/io/renku/search/http/routes/OperationRoutes.scala @@ -34,11 +34,11 @@ object OperationRoutes extends TapirBorerJson { .description("Ping") .serverLogic[F](_ => "pong".asRight[Unit].pure[F]) - private given Schema[CurrentVersion] = Schema.derived private def versionEndpoint[F[_]: Async] = - endpoint.get.in("version") + endpoint.get + .in("version") .out(borerJsonBody[CurrentVersion]) .description("Return version information") .serverLogicSuccess[F](_ => CurrentVersion.get.pure[F])