diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index cd4e105..3249113 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.10.1 5281a20e456f57d32de29804d5720856fd6986bf + +# Scala Steward: Reformat with scalafmt 3.11.1 +7f8b698db4df5f3171e7074d43d866a40a48a6ba diff --git a/.scalafmt.conf b/.scalafmt.conf index 9b0adfd..6d0ee03 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.10.7" +version = "3.11.1" runner.dialect = scala213source3 project.git = true diff --git a/bifunctor-tagless/js/src/main/scala/leaderboard/sim/SimulationMain.scala b/bifunctor-tagless/js/src/main/scala/leaderboard/sim/SimulationMain.scala index c1362df..64290f7 100644 --- a/bifunctor-tagless/js/src/main/scala/leaderboard/sim/SimulationMain.scala +++ b/bifunctor-tagless/js/src/main/scala/leaderboard/sim/SimulationMain.scala @@ -67,7 +67,8 @@ object SimulationMain { // the page. We never finalize — the in-memory dummy state should live as // long as the JS module is loaded. val program: G[Nothing] = - Injector.NoProxies[G]() + Injector + .NoProxies[G]() // `Roots.Everything` instead of `Roots.target[LocalDispatcher]` because // `LeaderboardCoreModule.api` adds `LadderApi`/`ProfileApi` to the // `Set[HttpApi[F]]` as *weak* references — they only join the set if diff --git a/bifunctor-tagless/shared/src/main/scala/leaderboard/dispatch/LocalDispatcher.scala b/bifunctor-tagless/shared/src/main/scala/leaderboard/dispatch/LocalDispatcher.scala index 2658404..bd1a757 100644 --- a/bifunctor-tagless/shared/src/main/scala/leaderboard/dispatch/LocalDispatcher.scala +++ b/bifunctor-tagless/shared/src/main/scala/leaderboard/dispatch/LocalDispatcher.scala @@ -37,8 +37,9 @@ object LocalDispatcher { method = Method.fromString(method).getOrElse(Method.GET), uri = Uri.unsafeFromString(path), ).withEntity(body) - httpApp.run(req).flatMap { resp => - resp.as[String].map(text => Response(resp.status.code, text)) + httpApp.run(req).flatMap { + resp => + resp.as[String].map(text => Response(resp.status.code, text)) } } } diff --git a/build.sbt b/build.sbt index 74d5744..91a7e63 100644 --- a/build.sbt +++ b/build.sbt @@ -11,11 +11,11 @@ val V = new { val http4s = "0.23.34" val doobie = "1.0.0-RC12" val catsCore = "2.13.0" - val zio = "2.1.25" + val zio = "2.1.26" val zioCats = "23.1.0.13" val kindProjector = "0.13.4" val circeGeneric = "0.14.15" - val graalMetadata = "0.11.5" + val graalMetadata = "1.1.1" val catsEffect = "3.5.4" } @@ -103,20 +103,20 @@ lazy val `bifunctor-tagless` = crossProject(JVMPlatform, JSPlatform) .settings( sharedScalaSettings, libraryDependencies ++= Seq( - "io.7mind.izumi" %%% "distage-core" % V.distage, - "io.7mind.izumi" %%% "distage-extension-plugins" % V.distage, + "io.7mind.izumi" %%% "distage-core" % V.distage, + "io.7mind.izumi" %%% "distage-extension-plugins" % V.distage, "io.7mind.izumi" %%% "distage-extension-logstage" % V.distage, - "io.7mind.izumi" %%% "logstage-core" % V.logstage, - "org.http4s" %%% "http4s-dsl" % V.http4s, - "org.http4s" %%% "http4s-circe" % V.http4s, - "io.circe" %%% "circe-generic" % V.circeGeneric, - "org.typelevel" %%% "cats-core" % V.catsCore, - "dev.zio" %%% "zio" % V.zio, + "io.7mind.izumi" %%% "logstage-core" % V.logstage, + "org.http4s" %%% "http4s-dsl" % V.http4s, + "org.http4s" %%% "http4s-circe" % V.http4s, + "io.circe" %%% "circe-generic" % V.circeGeneric, + "org.typelevel" %%% "cats-core" % V.catsCore, + "dev.zio" %%% "zio" % V.zio, // `zio-managed` is required transitively by `zio-interop-cats`'s // ZManaged bridge classes; under scala.js the linker validates all // referenced classes, so we must pull the artifact in explicitly. - "dev.zio" %%% "zio-managed" % V.zio, - "dev.zio" %%% "zio-interop-cats" % V.zioCats, + "dev.zio" %%% "zio-managed" % V.zio, + "dev.zio" %%% "zio-interop-cats" % V.zioCats, ), ) .jvmConfigure(_.pipe(jvmSharedSettings(Seq(Deps.zio, Deps.zioCats)))) @@ -147,10 +147,11 @@ copySimJs := { val outDir = (`bifunctor-taglessJVM` / baseDirectory).value / "src" / "main" / "resources" / "webapp" IO.createDirectory(outDir) val srcs = (srcDir ** "*.js").get ++ (srcDir ** "*.js.map").get - srcs.map { f => - val dst = outDir / f.getName - IO.copyFile(f, dst, preserveLastModified = true) - dst + srcs.map { + f => + val dst = outDir / f.getName + IO.copyFile(f, dst, preserveLastModified = true) + dst } } diff --git a/project/build.properties b/project/build.properties index df061f4..dabdb15 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.12.9 +sbt.version=1.12.11 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7a1151b..7c9cdd9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.3") +addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.5") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.13") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.21.0")