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
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ val catsParseVersion = "1.1.0"
val catsEffectVersion = "3.7.0"
val circeVersion = "0.14.15"
val disciplineMunitVersion = "2.0.0"
val doobieVersion = "1.0.0-RC12"
val doobieVersion = "1.0.0-RC13"
val fs2Version = "3.13.0"
val http4sVersion = "0.23.34"
val kindProjectorVersion = "0.13.4"
Expand Down Expand Up @@ -257,7 +257,7 @@ lazy val doobiecore = project
Test / fork := true,
Test / parallelExecution := false,
libraryDependencies ++= Seq(
"org.tpolecat" %% "doobie-core" % doobieVersion,
"org.typelevel" %% "doobie-core" % doobieVersion,
"org.typelevel" %% "log4cats-core" % log4catsVersion,
"ch.qos.logback" % "logback-classic" % logbackVersion % "test"
)
Expand All @@ -278,7 +278,7 @@ lazy val doobiepg = project
Test / testOptions += Tests
.Setup(_ => runDocker("docker compose up -d --wait --quiet-pull postgres")),
libraryDependencies ++= Seq(
"org.tpolecat" %% "doobie-postgres-circe" % doobieVersion
"org.typelevel" %% "doobie-postgres-circe" % doobieVersion
)
)

Expand Down Expand Up @@ -372,9 +372,9 @@ lazy val demo = project
libraryDependencies ++= Seq(
"org.typelevel" %% "log4cats-slf4j" % log4catsVersion,
"ch.qos.logback" % "logback-classic" % logbackVersion,
"org.tpolecat" %% "doobie-core" % doobieVersion,
"org.tpolecat" %% "doobie-postgres" % doobieVersion,
"org.tpolecat" %% "doobie-hikari" % doobieVersion,
"org.typelevel" %% "doobie-core" % doobieVersion,
"org.typelevel" %% "doobie-postgres" % doobieVersion,
"org.typelevel" %% "doobie-hikari" % doobieVersion,
"org.http4s" %% "http4s-ember-server" % http4sVersion,
"org.http4s" %% "http4s-ember-client" % http4sVersion,
"org.http4s" %% "http4s-circe" % http4sVersion,
Expand Down
2 changes: 1 addition & 1 deletion demo/src/main/scala/demo/world/WorldData.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import java.util.concurrent.Executors
import scala.concurrent.ExecutionContext

import cats.effect.{Async, Resource}
import doobie.hikari.HikariTransactor
import org.typelevel.doobie.hikari.HikariTransactor

object WorldData {
def mkTransactor[F[_]: Async](
Expand Down
2 changes: 1 addition & 1 deletion demo/src/main/scala/demo/world/WorldMapping.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package demo.world

import cats.effect.{Async, Resource, Sync}
import doobie.{Meta, Transactor}
import org.typelevel.doobie.{Meta, Transactor}
import org.typelevel.log4cats.Logger
import org.typelevel.log4cats.slf4j.Slf4jLogger

Expand Down
8 changes: 4 additions & 4 deletions modules/doobie-core/src/main/scala/DoobieMapping.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package grackle.doobie

import cats.Reducible
import cats.effect.Sync
import doobie.{Fragment => DoobieFragment, Meta, Put, Read, Transactor}
import doobie.enumerated.JdbcType._
import doobie.implicits._
import doobie.util.fragments
import org.typelevel.doobie.{Fragment => DoobieFragment, Meta, Put, Read, Transactor}
import org.typelevel.doobie.enumerated.JdbcType._
import org.typelevel.doobie.implicits._
import org.typelevel.doobie.util.fragments
import org.tpolecat.sourcepos.SourcePos
import org.tpolecat.typename.TypeName

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package grackle.doobie

import cats.effect.Sync
import doobie.util.transactor.Transactor
import org.typelevel.doobie.util.transactor.Transactor
import org.typelevel.log4cats.Logger

import grackle.Mapping
Expand Down
2 changes: 1 addition & 1 deletion modules/doobie-core/src/main/scala/DoobieMonitor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package grackle.doobie
import cats.Applicative
import cats.effect.{Ref, Sync}
import cats.implicits._
import doobie.Fragment
import org.typelevel.doobie.Fragment
import org.typelevel.log4cats.Logger

import grackle.{Query, Result}
Expand Down
2 changes: 1 addition & 1 deletion modules/doobie-core/src/main/scala/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

package grackle

import _root_.doobie.Fragment
import org.typelevel.doobie.Fragment

import grackle.sql.SqlMonitor

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package grackle.doobie.test

import java.time.Duration

import doobie.Meta
import org.typelevel.doobie.Meta
import io.circe.{Decoder => CDecoder, Encoder => CEncoder}
import munit.CatsEffectSuite

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package grackle.doobie.mssql

import cats.effect.Sync
import cats.syntax.all._
import doobie.Transactor
import org.typelevel.doobie.Transactor

import grackle.Mapping
import grackle.Query.OrderSelection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import scala.util.Try

import cats.effect.{IO, Resource, Sync}
import cats.syntax.all._
import doobie.{Meta, Transactor}
import doobie.enumerated.JdbcType
import doobie.util.meta.MetaConstructors.Basic
import org.typelevel.doobie.{Meta, Transactor}
import org.typelevel.doobie.enumerated.JdbcType
import org.typelevel.doobie.util.meta.MetaConstructors.Basic
import io.circe.{Decoder => CDecoder, Encoder => CEncoder, Json}
import io.circe.parser.parse
import io.circe.syntax._
Expand Down
8 changes: 4 additions & 4 deletions modules/doobie-mssql/src/test/scala/DoobieMSSqlSuites.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package grackle.doobie.mssql.test

import cats.effect.{IO, Resource}
import doobie.{Meta, Transactor}
import doobie.implicits._
import org.typelevel.doobie.{Meta, Transactor}
import org.typelevel.doobie.implicits._
import munit.catseffect.IOFixture

import grackle.Mapping
Expand All @@ -30,7 +30,7 @@ final class ArrayJoinSuite extends DoobieMSSqlDatabaseSuite with SqlArrayJoinSui
}

final class CoalesceSuite extends DoobieMSSqlDatabaseSuite with SqlCoalesceSuite {
type Fragment = doobie.Fragment
type Fragment = org.typelevel.doobie.Fragment
def mapping: IO[(Mapping[IO], SqlStatsMonitor[IO, Fragment])] =
DoobieMonitor
.statsMonitor[IO]
Expand Down Expand Up @@ -234,7 +234,7 @@ final class WorldSuite extends DoobieMSSqlDatabaseSuite with SqlWorldSuite {
}

final class WorldCompilerSuite extends DoobieMSSqlDatabaseSuite with SqlWorldCompilerSuite {
type Fragment = doobie.Fragment
type Fragment = org.typelevel.doobie.Fragment

def mapping: IO[(Mapping[IO], SqlStatsMonitor[IO, Fragment])] =
DoobieMonitor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package grackle.doobie.oracle

import cats.effect.Sync
import cats.syntax.all._
import doobie.Transactor
import org.typelevel.doobie.Transactor

import grackle.Mapping
import grackle.Query.OrderSelection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import scala.util.Try
import cats.data.NonEmptyList
import cats.effect.{IO, Resource, Sync}
import cats.syntax.all._
import doobie.{Meta, Transactor}
import doobie.enumerated.JdbcType
import doobie.util.Put
import doobie.util.meta.MetaConstructors.Basic
import org.typelevel.doobie.{Meta, Transactor}
import org.typelevel.doobie.enumerated.JdbcType
import org.typelevel.doobie.util.Put
import org.typelevel.doobie.util.meta.MetaConstructors.Basic
import io.circe.Json
import io.circe.parser.parse
import munit.catseffect._
Expand Down
8 changes: 4 additions & 4 deletions modules/doobie-oracle/src/test/scala/DoobieOracleSuites.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package grackle.doobie.oracle.test

import cats.effect.{IO, Resource}
import doobie.{Meta, Transactor}
import doobie.implicits._
import org.typelevel.doobie.{Meta, Transactor}
import org.typelevel.doobie.implicits._
import munit.catseffect.IOFixture

import grackle.Mapping
Expand All @@ -30,7 +30,7 @@ final class ArrayJoinSuite extends DoobieOracleDatabaseSuite with SqlArrayJoinSu
}

final class CoalesceSuite extends DoobieOracleDatabaseSuite with SqlCoalesceSuite {
type Fragment = doobie.Fragment
type Fragment = org.typelevel.doobie.Fragment
def mapping: IO[(Mapping[IO], SqlStatsMonitor[IO, Fragment])] =
DoobieMonitor
.statsMonitor[IO]
Expand Down Expand Up @@ -240,7 +240,7 @@ final class WorldSuite extends DoobieOracleDatabaseSuite with SqlWorldSuite {
}

final class WorldCompilerSuite extends DoobieOracleDatabaseSuite with SqlWorldCompilerSuite {
type Fragment = doobie.Fragment
type Fragment = org.typelevel.doobie.Fragment

def mapping: IO[(Mapping[IO], SqlStatsMonitor[IO, Fragment])] =
DoobieMonitor
Expand Down
2 changes: 1 addition & 1 deletion modules/doobie-pg/src/main/scala/DoobiePgMapping.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package grackle.doobie.postgres

import cats.effect.Sync
import doobie.Transactor
import org.typelevel.doobie.Transactor

import grackle.Mapping
import grackle.doobie._
Expand Down
6 changes: 3 additions & 3 deletions modules/doobie-pg/src/test/scala/DoobiePgDatabaseSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import java.time.{LocalDate, LocalTime, OffsetDateTime}
import java.util.UUID

import cats.effect.{IO, Resource, Sync}
import doobie.{Get, Meta, Put, Transactor}
import doobie.postgres.circe.jsonb.implicits._
import doobie.postgres.implicits._
import org.typelevel.doobie.{Get, Meta, Put, Transactor}
import org.typelevel.doobie.postgres.circe.jsonb.implicits._
import org.typelevel.doobie.postgres.implicits._
import io.circe.Json
import munit.catseffect.IOFixture

Expand Down
8 changes: 4 additions & 4 deletions modules/doobie-pg/src/test/scala/DoobiePgSuites.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package grackle.doobie.postgres.test

import cats.effect.{IO, Resource}
import doobie.{Meta, Transactor}
import doobie.implicits._
import org.typelevel.doobie.{Meta, Transactor}
import org.typelevel.doobie.implicits._
import munit.catseffect.IOFixture

import grackle.Mapping
Expand All @@ -30,7 +30,7 @@ final class ArrayJoinSuite extends DoobiePgDatabaseSuite with SqlArrayJoinSuite
}

final class CoalesceSuite extends DoobiePgDatabaseSuite with SqlCoalesceSuite {
type Fragment = doobie.Fragment
type Fragment = org.typelevel.doobie.Fragment
def mapping: IO[(Mapping[IO], SqlStatsMonitor[IO, Fragment])] =
DoobieMonitor
.statsMonitor[IO]
Expand Down Expand Up @@ -236,7 +236,7 @@ final class WorldSuite extends DoobiePgDatabaseSuite with SqlWorldSuite {
}

final class WorldCompilerSuite extends DoobiePgDatabaseSuite with SqlWorldCompilerSuite {
type Fragment = doobie.Fragment
type Fragment = org.typelevel.doobie.Fragment

def mapping: IO[(Mapping[IO], SqlStatsMonitor[IO, Fragment])] =
DoobieMonitor
Expand Down
4 changes: 2 additions & 2 deletions profile/src/main/scala/Bench.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import scala.concurrent.duration._

import cats.effect.{ExitCode, IO, IOApp, Sync}
import cats.implicits._
import doobie.util.meta.Meta
import doobie.util.transactor.Transactor
import org.typelevel.doobie.util.meta.Meta
import org.typelevel.doobie.util.transactor.Transactor

import grackle._
import grackle.Predicate._
Expand Down
Loading