Skip to content

Commit 0c4e853

Browse files
authored
chores: various update inc scala 3.5.2 (#389)
1 parent 925cbdc commit 0c4e853

File tree

13 files changed

+47
-36
lines changed

13 files changed

+47
-36
lines changed

.github/workflows/ci-backend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
extraSbtFiles: 'tmp/remote-cache/**'
3333

3434
- name: "Starting up Redis 🐳"
35-
run: docker-compose up -d redis
35+
run: docker compose up -d redis
3636

3737
- name: "Install Nix ❄️"
3838
uses: cachix/install-nix-action@v22
@@ -47,4 +47,4 @@ jobs:
4747
run: nix develop -c sbt 'pullRemoteCache;test;it/test;webapp/fastLinkJS;pushRemoteCache'
4848

4949
- name: "Shutting down Redis 🐳"
50-
run: docker-compose down
50+
run: docker compose down

.github/workflows/ci-smokey.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ jobs:
4343
docker tag ghcr.io/gvolpe/trading-ws trading-ws:latest
4444
4545
- name: "Starting up Pulsar & Redis 🐳"
46-
run: docker-compose up -d pulsar redis
46+
run: docker compose up -d pulsar redis
4747

4848
- name: "Starting up trading core services 🐳"
49-
run: docker-compose up -d processor alerts ws-server
49+
run: docker compose up -d processor alerts ws-server
5050

5151
- name: "Run smokey tests 🚀"
5252
run: nix develop -c sbt 'smokey/test'
5353

5454
- name: "Shutting down containers 🐳"
55-
run: docker-compose down
55+
run: docker compose down

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Dependencies._
22
import sbtwelcome._
33

4-
ThisBuild / scalaVersion := "3.4.1"
4+
ThisBuild / scalaVersion := "3.5.2"
55
ThisBuild / version := "0.1.0"
66
ThisBuild / organization := "dev.profunktor"
77
ThisBuild / organizationName := "ProfunKtor"

modules/domain/jvm/src/test/scala/trading/domain/generators.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ object generators:
8888
val symbolGen: Gen[Symbol] =
8989
Gen
9090
.oneOf("EURPLN", "GBPUSD", "CADUSD", "EURUSD", "CHFUSD", "CHFEUR")
91-
.map(s => Symbol(s.refine))
91+
.map(s => Symbol(s.refineUnsafe))
9292

9393
val symbolWithEmptyGen: Gen[Symbol] =
9494
Gen.frequency(

modules/domain/shared/src/main/scala/trading/domain.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import scala.concurrent.duration.FiniteDuration
66

77
import trading.*
88

9-
import cats.{ Eq, Monoid, Order, Show }
9+
import cats.{ Monoid, Show }
1010
import io.circe.*
1111

1212
export Extensions.*

modules/forecasts/src/main/scala/trading/forecasts/cdc/OutboxEvent.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import trading.domain.*
44
import trading.events.*
55

66
import io.circe.Codec
7+
import io.circe.Decoder
8+
9+
// Upgrading from circe 0.14.6 to 0.14.7 requires this instance ¯\_(ツ)_/¯
10+
given Codec[Either[AuthorEvent, ForecastEvent]] = Codec.AsObject.derived
711

812
final case class OutboxEvent(
913
event_id: EventId,

modules/forecasts/src/main/scala/trading/forecasts/store/SQL.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ object SQL:
2020
}
2121

2222
given Read[Forecast] = Read[(UUID, String, String, String, Int)].map { (id, sl, tag, desc, sc) =>
23-
Forecast(ForecastId(id), Symbol(sl.refine), ForecastTag.from(tag), ForecastDescription(desc), ForecastScore(sc))
23+
Forecast(
24+
ForecastId(id),
25+
Symbol(sl.refineUnsafe),
26+
ForecastTag.from(tag),
27+
ForecastDescription(desc),
28+
ForecastScore(sc)
29+
)
2430
}
2531

2632
extension (res: VoteResult)

modules/forecasts/src/test/scala/trading/forecasts/EngineSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import trading.domain.*
99
import trading.events.*
1010
import trading.forecasts.store.*
1111
import trading.lib.*
12-
import trading.lib.Consumer.{ Msg, MsgId }
12+
import trading.lib.Consumer.MsgId
1313
import trading.lib.Logger.NoOp.given
1414

1515
import cats.effect.IO

modules/forecasts/src/test/scala/trading/forecasts/VotesHandlerSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import trading.domain.*
77
import trading.events.*
88
import trading.forecasts.store.*
99
import trading.lib.*
10-
import trading.lib.Consumer.{ Msg, MsgId }
10+
import trading.lib.Consumer.MsgId
1111
import trading.lib.Logger.NoOp.given
1212

1313
import cats.effect.IO

modules/lib/src/main/scala/trading/lib/ext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package trading.lib
22

33
import scala.reflect.ClassTag
44

5-
import trading.lib.Consumer.{ Msg, MsgId }
5+
import trading.lib.Consumer.Msg
66

77
import cats.{ Monad, MonadThrow }
88
import cats.effect.kernel.Deferred

modules/x-demo/src/main/scala/demo/PulsarCDC.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import trading.lib.Logger.NoOp.given
1010

1111
import cats.effect.*
1212
import dev.profunktor.pulsar.{ Config as PulsarConfig, Pulsar, Subscription, Topic }
13-
import doobie.Transactor
1413
import doobie.*
1514
import doobie.implicits.*
1615
import doobie.postgres.*

project/Dependencies.scala

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,38 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
44
object Dependencies {
55

66
object V {
7-
val cats = "2.10.0"
8-
val catsEffect = "3.5.4"
9-
val circe = "0.14.6"
10-
val ciris = "3.2.0"
11-
val doobie = "1.0.0-RC4"
7+
val cats = "2.12.0"
8+
val catsEffect = "3.5.7"
9+
val circe = "0.14.10"
10+
val circeRefined = "0.15.1"
11+
val ciris = "3.6.0"
12+
val doobie = "1.0.0-RC6"
1213
val flyway = "8.5.13"
13-
val fs2Core = "3.9.4"
14-
val fs2Kafka = "3.4.0"
15-
val http4s = "1.0.0-M41"
14+
val fs2Core = "3.11.0"
15+
val fs2Kafka = "3.6.0"
16+
val http4s = "1.0.0-M43"
1617
val http4sMetrics = "1.0.0-M38"
1718
val http4sWs = "1.0.0-M9"
18-
val ip4s = "3.4.0"
19+
val ip4s = "3.6.0"
1920
val iron = "2.6.0"
20-
val kittens = "3.3.0"
21+
val kittens = "3.4.0"
2122
val log4cats = "2.7.0"
22-
val monocle = "3.2.0"
23-
val natchez = "0.3.5"
24-
val natchezHttp4s = "0.5.0"
23+
val monocle = "3.3.0"
24+
val natchez = "0.3.7"
25+
val natchezHttp4s = "0.6.0"
2526
val neutron = "0.8.0"
26-
val odin = "0.13.0"
27+
val odin = "0.15.0"
2728
val redis4cats = "1.7.1"
28-
val refined = "0.11.1"
29+
val refined = "0.11.2"
2930

3031
val scalajsTime = "2.4.0"
3132
val tyrian = "0.6.1"
3233

33-
val scalacheck = "1.18.0"
34+
val scalacheck = "1.18.1"
3435
val weaver = "0.8.4"
3536

3637
val organizeImports = "0.6.0"
37-
val zerowaste = "0.2.21"
38+
val zerowaste = "0.2.27"
3839
}
3940

4041
object Libraries {
@@ -52,7 +53,8 @@ object Dependencies {
5253

5354
val circeCore = circe("core")
5455
val circeParser = circe("parser")
55-
val circeRefined = circe("refined")
56+
57+
val circeRefined = Def.setting("io.circe" %%% "circe-refined" % V.circeRefined)
5658

5759
val doobieH2 = "org.tpolecat" %% "doobie-h2" % V.doobie
5860
val doobiePg = "org.tpolecat" %% "doobie-postgres" % V.doobie
@@ -81,7 +83,7 @@ object Dependencies {
8183

8284
val monocleCore = Def.setting("dev.optics" %%% "monocle-core" % V.monocle)
8385

84-
val odin = "com.github.valskalla" %% "odin-core" % V.odin
86+
val odin = "dev.scalafreaks" %% "odin-core" % V.odin
8587

8688
// only for ember
8789
val log4catsNoop = "org.typelevel" %% "log4cats-noop" % V.log4cats

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0")
1+
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
22
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
3-
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
3+
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
44
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
5-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
6-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
5+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
6+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
77
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
88
addSbtPlugin("com.github.reibitto" % "sbt-welcome" % "0.4.0")

0 commit comments

Comments
 (0)