Skip to content

Commit

Permalink
Merge branch 'master' into update/munit-1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
ornicar authored Jan 23, 2025
2 parents d2584c4 + 49b3a7d commit c531dde
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:
java-version: 21
cache: sbt

- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
java-version: 21
cache: sbt

- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Build project
run: sbt test

Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
inThisBuild(
Seq(
scalaVersion := "3.6.2",
scalaVersion := "3.6.3",
versionScheme := Some("early-semver"),
version := "3.3",
semanticdbEnabled := true, // for scalafix
Expand All @@ -13,10 +13,10 @@ val os = if (sys.props.get("os.name").exists(_.startsWith("Mac"))) "osx" else
val arch = if (sys.props.get("os.arch").exists(_.startsWith("aarch64"))) "aarch-64" else "x86-64"
val arch_ = arch.replace("-", "_")

val pekkoVersion = "1.1.2"
val pekkoVersion = "1.1.3"
val kamonVersion = "2.7.5"
val nettyVersion = "4.1.116.Final"
val chessVersion = "16.6.0"
val nettyVersion = "4.1.117.Final"
val chessVersion = "17.2.0"

lazy val `lila-ws` = project
.in(file("."))
Expand All @@ -30,7 +30,7 @@ lazy val `lila-ws` = project
("org.reactivemongo" %% "reactivemongo" % "1.1.0-RC13")
.exclude("org.scala-lang.modules", "scala-java8-compat_2.13"),
"org.reactivemongo" % s"reactivemongo-shaded-native-$os-$arch" % "1.1.0-RC14",
"io.lettuce" % "lettuce-core" % "6.5.1.RELEASE",
"io.lettuce" % "lettuce-core" % "6.5.2.RELEASE",
"io.netty" % "netty-handler" % nettyVersion,
"io.netty" % "netty-codec-http" % nettyVersion,
("io.netty" % s"netty-transport-native-epoll" % nettyVersion)
Expand All @@ -49,7 +49,7 @@ lazy val `lila-ws` = project
"io.kamon" %% "kamon-influxdb" % kamonVersion,
"io.kamon" %% "kamon-prometheus" % kamonVersion,
"io.kamon" %% "kamon-system-metrics" % kamonVersion,
"com.softwaremill.macwire" %% "macros" % "2.6.4" % "provided",
"com.softwaremill.macwire" %% "macros" % "2.6.5" % "provided",
"com.roundeights" %% "hasher" % "1.3.1",
"org.scalameta" %% "munit" % "1.0.4" % Test
),
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0")
2 changes: 1 addition & 1 deletion src/main/scala/History.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package lila.ws

import cats.syntax.option.*
import cats.data.NonEmptyList
import cats.syntax.option.*

final class History[K, V <: ipc.ClientIn.HasVersion](
historySize: Int,
Expand Down
1 change: 1 addition & 0 deletions src/main/scala/RoomCrowd.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package lila.ws

import cats.syntax.option.*

import ipc.*

final class RoomCrowd(json: CrowdJson, groupedWithin: util.GroupedWithin)(using ec: Executor):
Expand Down
1 change: 1 addition & 0 deletions src/main/scala/Users.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package lila.ws

import cats.syntax.option.*
import org.apache.pekko.actor.typed.Scheduler

import java.util.concurrent.ConcurrentHashMap
import scala.jdk.CollectionConverters.*

Expand Down

0 comments on commit c531dde

Please sign in to comment.