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
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.11.1"
version = "3.11.4"
runner.dialect = scala213source3
project.git = true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package leaderboard.plugins
import distage.StandardAxis.Repo
import distage.config.ConfigModuleDef
import distage.{ModuleDef, Scene, TagKK}
import doobie.util.transactor.Transactor
import org.typelevel.doobie.util.transactor.Transactor
import izumi.distage.plugins.PluginDef
import izumi.distage.roles.bundled.BundledRolesModule
import izumi.distage.roles.model.definition.RoleModuleDef
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package leaderboard.repo

import distage.Lifecycle
import doobie.postgres.implicits.*
import doobie.syntax.string.*
import org.typelevel.doobie.postgres.implicits.*
import org.typelevel.doobie.syntax.string.*
import izumi.functional.bio.Monad2
import leaderboard.model.{QueryFailure, Score, UserId}
import leaderboard.sql.SQL
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package leaderboard.repo

import distage.Lifecycle
import doobie.postgres.implicits.*
import doobie.implicits.*
import org.typelevel.doobie.postgres.implicits.*
import org.typelevel.doobie.implicits.*
import izumi.functional.bio.Monad2
import leaderboard.model.{QueryFailure, UserId, UserProfile}
import leaderboard.sql.SQL
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package leaderboard.sql

import doobie.free.connection.ConnectionIO
import doobie.util.transactor.Transactor
import org.typelevel.doobie.free.connection.ConnectionIO
import org.typelevel.doobie.util.transactor.Transactor
import izumi.functional.bio.Panic2
import izumi.functional.bio.catz.*
import leaderboard.model.QueryFailure
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package leaderboard.sql

import cats.effect.{Async, Sync}
import distage.{Id, Lifecycle}
import doobie.hikari.HikariTransactor
import org.typelevel.doobie.hikari.HikariTransactor
import izumi.distage.model.provisioning.IntegrationCheck
import izumi.fundamentals.platform.integration.{PortCheck, ResourceCheck}
import leaderboard.config.{PostgresCfg, PostgresPortCfg}
Expand Down
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ val V = new {
val logstage = distage
val scalatest = "3.2.20"
val scalacheck = "1.19.0"
val http4s = "0.23.34"
val doobie = "1.0.0-RC12"
val http4s = "0.23.36"
val doobie = "1.0.0-RC13"
val catsCore = "2.13.0"
val zio = "2.1.26"
val zioCats = "23.1.0.13"
val kindProjector = "0.13.4"
val circeGeneric = "0.14.15"
val graalMetadata = "1.1.1"
val circeGeneric = "0.14.16"
val graalMetadata = "1.1.5"
val catsEffect = "3.5.4"
}

Expand All @@ -37,9 +37,9 @@ val Deps = new {

val circeGeneric = "io.circe" %% "circe-generic" % V.circeGeneric

val doobie = "org.tpolecat" %% "doobie-core" % V.doobie
val doobiePostgres = "org.tpolecat" %% "doobie-postgres" % V.doobie
val doobieHikari = "org.tpolecat" %% "doobie-hikari" % V.doobie
val doobie = "org.typelevel" %% "doobie-core" % V.doobie
val doobiePostgres = "org.typelevel" %% "doobie-postgres" % V.doobie
val doobieHikari = "org.typelevel" %% "doobie-hikari" % V.doobie

val kindProjector = "org.typelevel" % "kind-projector" % V.kindProjector cross CrossVersion.full

Expand Down Expand Up @@ -76,8 +76,8 @@ val Deps = new {

inThisBuild(
Seq(
crossScalaVersions := Seq("2.13.18", "3.3.7"),
// crossScalaVersions := Seq("3.3.7", "2.13.18"), // uncomment to use Scala 3 in IDE
crossScalaVersions := Seq("2.13.18", "3.3.8"),
// crossScalaVersions := Seq("3.3.8", "2.13.18"), // uncomment to use Scala 3 in IDE
scalaVersion := crossScalaVersions.value.head,
version := "1.0.0",
organization := "io.7mind",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package leaderboard.plugins
import distage.StandardAxis.Repo
import distage.config.ConfigModuleDef
import distage.{ModuleDef, Scene, TagK}
import doobie.util.transactor.Transactor
import org.typelevel.doobie.util.transactor.Transactor
import izumi.distage.plugins.{PluginBase, PluginDef}
import izumi.distage.roles.bundled.BundledRolesModule
import izumi.distage.roles.model.definition.RoleModuleDef
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import cats.Monad
import cats.effect.{Concurrent, Ref}
import cats.syntax.all.*
import distage.Lifecycle
import doobie.postgres.implicits.*
import doobie.syntax.string.*
import org.typelevel.doobie.postgres.implicits.*
import org.typelevel.doobie.syntax.string.*
import leaderboard.model.{Score, UserId}
import leaderboard.sql.SQL
import logstage.LogIO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import cats.Monad
import cats.effect.{Concurrent, Ref}
import cats.syntax.all.*
import distage.Lifecycle
import doobie.postgres.implicits.*
import doobie.implicits.*
import org.typelevel.doobie.postgres.implicits.*
import org.typelevel.doobie.implicits.*
import leaderboard.model.{UserId, UserProfile}
import leaderboard.sql.SQL
import logstage.LogIO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package leaderboard.sql

import cats.effect.Async
import cats.syntax.applicativeError.*
import doobie.free.connection.ConnectionIO
import doobie.util.transactor.Transactor
import org.typelevel.doobie.free.connection.ConnectionIO
import org.typelevel.doobie.util.transactor.Transactor
import leaderboard.model.QueryFailure

trait SQL[F[_]] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package leaderboard.sql

import cats.effect.{Async, Sync}
import distage.{Id, Lifecycle}
import doobie.hikari.HikariTransactor
import org.typelevel.doobie.hikari.HikariTransactor
import izumi.distage.model.provisioning.IntegrationCheck
import izumi.fundamentals.platform.integration.{PortCheck, ResourceCheck}
import leaderboard.config.{PostgresCfg, PostgresPortCfg}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import cats.effect.IO
import distage.StandardAxis.Repo
import distage.config.ConfigModuleDef
import distage.{ModuleDef, Scene}
import doobie.util.transactor.Transactor
import org.typelevel.doobie.util.transactor.Transactor
import izumi.distage.plugins.PluginDef
import izumi.distage.roles.bundled.BundledRolesModule
import izumi.distage.roles.model.definition.RoleModuleDef
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package leaderboard.repo

import cats.effect.{IO, Ref}
import distage.Lifecycle
import doobie.postgres.implicits.*
import doobie.syntax.string.*
import org.typelevel.doobie.postgres.implicits.*
import org.typelevel.doobie.syntax.string.*
import leaderboard.model.{Score, UserId}
import leaderboard.sql.SQL
import logstage.LogIO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package leaderboard.repo

import cats.effect.{IO, Ref}
import distage.Lifecycle
import doobie.implicits.*
import doobie.postgres.implicits.*
import org.typelevel.doobie.implicits.*
import org.typelevel.doobie.postgres.implicits.*
import leaderboard.model.{UserId, UserProfile}
import leaderboard.sql.SQL
import logstage.LogIO
Expand Down
4 changes: 2 additions & 2 deletions monomorphic-cats/src/main/scala/leaderboard/sql/SQL.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package leaderboard.sql

import cats.effect.IO
import doobie.free.connection.ConnectionIO
import doobie.util.transactor.Transactor
import org.typelevel.doobie.free.connection.ConnectionIO
import org.typelevel.doobie.util.transactor.Transactor
import leaderboard.model.QueryFailure

trait SQL {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package leaderboard.sql

import distage.{Id, Lifecycle}
import doobie.hikari.HikariTransactor
import org.typelevel.doobie.hikari.HikariTransactor
import izumi.distage.model.provisioning.IntegrationCheck
import izumi.fundamentals.platform.integration.{PortCheck, ResourceCheck}
import leaderboard.config.{PostgresCfg, PostgresPortCfg}
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.11
sbt.version=1.12.14
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.5")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.7")
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")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")