Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Scala Steward: Reformat with scalafmt 3.10.1
5281a20e456f57d32de29804d5720856fd6986bf

# Scala Steward: Reformat with scalafmt 3.11.1
7f8b698db4df5f3171e7074d43d866a40a48a6ba
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.10.7"
version = "3.11.1"
runner.dialect = scala213source3
project.git = true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
}
Expand Down
33 changes: 17 additions & 16 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -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))))
Expand Down Expand Up @@ -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
}
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.12.9
sbt.version=1.12.11
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Expand Down