diff --git a/build.sbt b/build.sbt index 7754aee1..be69aa94 100644 --- a/build.sbt +++ b/build.sbt @@ -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" @@ -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" ) @@ -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 ) ) @@ -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, diff --git a/demo/src/main/scala/demo/world/WorldData.scala b/demo/src/main/scala/demo/world/WorldData.scala index 8cbcccf4..af622e96 100644 --- a/demo/src/main/scala/demo/world/WorldData.scala +++ b/demo/src/main/scala/demo/world/WorldData.scala @@ -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]( diff --git a/demo/src/main/scala/demo/world/WorldMapping.scala b/demo/src/main/scala/demo/world/WorldMapping.scala index ec153d29..8d78aeaf 100644 --- a/demo/src/main/scala/demo/world/WorldMapping.scala +++ b/demo/src/main/scala/demo/world/WorldMapping.scala @@ -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 diff --git a/modules/doobie-core/src/main/scala/DoobieMapping.scala b/modules/doobie-core/src/main/scala/DoobieMapping.scala index a8ba350a..814fc8e7 100644 --- a/modules/doobie-core/src/main/scala/DoobieMapping.scala +++ b/modules/doobie-core/src/main/scala/DoobieMapping.scala @@ -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 diff --git a/modules/doobie-core/src/main/scala/DoobieMappingCompanion.scala b/modules/doobie-core/src/main/scala/DoobieMappingCompanion.scala index c44c24e6..7bb54ef8 100644 --- a/modules/doobie-core/src/main/scala/DoobieMappingCompanion.scala +++ b/modules/doobie-core/src/main/scala/DoobieMappingCompanion.scala @@ -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 diff --git a/modules/doobie-core/src/main/scala/DoobieMonitor.scala b/modules/doobie-core/src/main/scala/DoobieMonitor.scala index a6e7fb2d..f9b806e3 100644 --- a/modules/doobie-core/src/main/scala/DoobieMonitor.scala +++ b/modules/doobie-core/src/main/scala/DoobieMonitor.scala @@ -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} diff --git a/modules/doobie-core/src/main/scala/package.scala b/modules/doobie-core/src/main/scala/package.scala index 6505fe82..8bdb82f5 100644 --- a/modules/doobie-core/src/main/scala/package.scala +++ b/modules/doobie-core/src/main/scala/package.scala @@ -15,7 +15,7 @@ package grackle -import _root_.doobie.Fragment +import org.typelevel.doobie.Fragment import grackle.sql.SqlMonitor diff --git a/modules/doobie-core/src/test/scala/DoobieDatabaseSuite.scala b/modules/doobie-core/src/test/scala/DoobieDatabaseSuite.scala index 09e46010..6dde044b 100644 --- a/modules/doobie-core/src/test/scala/DoobieDatabaseSuite.scala +++ b/modules/doobie-core/src/test/scala/DoobieDatabaseSuite.scala @@ -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 diff --git a/modules/doobie-mssql/src/main/scala/DoobieMSSqlMapping.scala b/modules/doobie-mssql/src/main/scala/DoobieMSSqlMapping.scala index 691e1c0a..0756d76b 100644 --- a/modules/doobie-mssql/src/main/scala/DoobieMSSqlMapping.scala +++ b/modules/doobie-mssql/src/main/scala/DoobieMSSqlMapping.scala @@ -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 diff --git a/modules/doobie-mssql/src/test/scala/DoobieMSSqlDatabaseSuite.scala b/modules/doobie-mssql/src/test/scala/DoobieMSSqlDatabaseSuite.scala index 8612f540..0a12bd70 100644 --- a/modules/doobie-mssql/src/test/scala/DoobieMSSqlDatabaseSuite.scala +++ b/modules/doobie-mssql/src/test/scala/DoobieMSSqlDatabaseSuite.scala @@ -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._ diff --git a/modules/doobie-mssql/src/test/scala/DoobieMSSqlSuites.scala b/modules/doobie-mssql/src/test/scala/DoobieMSSqlSuites.scala index 47c3f1e6..0078d922 100644 --- a/modules/doobie-mssql/src/test/scala/DoobieMSSqlSuites.scala +++ b/modules/doobie-mssql/src/test/scala/DoobieMSSqlSuites.scala @@ -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 @@ -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] @@ -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 diff --git a/modules/doobie-oracle/src/main/scala/DoobieOracleMapping.scala b/modules/doobie-oracle/src/main/scala/DoobieOracleMapping.scala index 69931007..774069a5 100644 --- a/modules/doobie-oracle/src/main/scala/DoobieOracleMapping.scala +++ b/modules/doobie-oracle/src/main/scala/DoobieOracleMapping.scala @@ -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 diff --git a/modules/doobie-oracle/src/test/scala/DoobieOracleDatabaseSuite.scala b/modules/doobie-oracle/src/test/scala/DoobieOracleDatabaseSuite.scala index 3dc7403d..b3335e22 100644 --- a/modules/doobie-oracle/src/test/scala/DoobieOracleDatabaseSuite.scala +++ b/modules/doobie-oracle/src/test/scala/DoobieOracleDatabaseSuite.scala @@ -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._ diff --git a/modules/doobie-oracle/src/test/scala/DoobieOracleSuites.scala b/modules/doobie-oracle/src/test/scala/DoobieOracleSuites.scala index bfc25cd1..75fc19d8 100644 --- a/modules/doobie-oracle/src/test/scala/DoobieOracleSuites.scala +++ b/modules/doobie-oracle/src/test/scala/DoobieOracleSuites.scala @@ -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 @@ -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] @@ -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 diff --git a/modules/doobie-pg/src/main/scala/DoobiePgMapping.scala b/modules/doobie-pg/src/main/scala/DoobiePgMapping.scala index 362cda74..0332e579 100644 --- a/modules/doobie-pg/src/main/scala/DoobiePgMapping.scala +++ b/modules/doobie-pg/src/main/scala/DoobiePgMapping.scala @@ -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._ diff --git a/modules/doobie-pg/src/test/scala/DoobiePgDatabaseSuite.scala b/modules/doobie-pg/src/test/scala/DoobiePgDatabaseSuite.scala index 6a832db5..614e356b 100644 --- a/modules/doobie-pg/src/test/scala/DoobiePgDatabaseSuite.scala +++ b/modules/doobie-pg/src/test/scala/DoobiePgDatabaseSuite.scala @@ -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 diff --git a/modules/doobie-pg/src/test/scala/DoobiePgSuites.scala b/modules/doobie-pg/src/test/scala/DoobiePgSuites.scala index f7dd5511..3d2452c6 100644 --- a/modules/doobie-pg/src/test/scala/DoobiePgSuites.scala +++ b/modules/doobie-pg/src/test/scala/DoobiePgSuites.scala @@ -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 @@ -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] @@ -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 diff --git a/profile/src/main/scala/Bench.scala b/profile/src/main/scala/Bench.scala index b0aefe54..bc584c61 100644 --- a/profile/src/main/scala/Bench.scala +++ b/profile/src/main/scala/Bench.scala @@ -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._