diff --git a/build.sbt b/build.sbt index d8b4cacc..0ca16c51 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ val munitScalaCheckVersion = "1.3.1" val mysqlDriverVersion = "26.7.0" val oracleDriverVersion = "23.26.3.0.0" val postgresVersion = "42.7.13" -val skunkVersion = "1.0.0" +val skunkVersion = "2.0.0-RC3" val sqliteDriverVersion = "3.53.4.0" val h2DriverVersion = "2.5.250" val shapeless2Version = "2.3.13" diff --git a/modules/skunk/js-jvm/src/test/scala/SkunkDatabaseSuite.scala b/modules/skunk/js-jvm/src/test/scala/SkunkDatabaseSuite.scala index 451bb247..a4b90423 100644 --- a/modules/skunk/js-jvm/src/test/scala/SkunkDatabaseSuite.scala +++ b/modules/skunk/js-jvm/src/test/scala/SkunkDatabaseSuite.scala @@ -21,10 +21,8 @@ import java.util.UUID import cats.effect.{IO, Resource, Sync} import io.circe.{Decoder => CDecoder, Encoder => CEncoder, Json} import munit.catseffect.IOFixture -import org.typelevel.otel4s.metrics.Meter -import org.typelevel.otel4s.metrics.Meter.Implicits.noop as metricsNoop -import org.typelevel.otel4s.trace.Tracer -import org.typelevel.otel4s.trace.Tracer.Implicits.noop +import org.typelevel.otel4s.metrics.MeterProvider +import org.typelevel.otel4s.trace.TracerProvider import skunk.{Codec => SCodec, Session} import skunk.circe.codec.{all => ccodec} import skunk.codec.{all => codec} @@ -35,8 +33,8 @@ import grackle.sqlpg.test._ trait SkunkDatabaseSuite extends SqlPgDatabaseSuite { - implicit val meter: Meter[IO] = metricsNoop[IO] - implicit val tracer: Tracer[IO] = noop[IO] + implicit val meterProvider: MeterProvider[IO] = MeterProvider.noop[IO] + implicit val tracerProvider: TracerProvider[IO] = TracerProvider.noop[IO] def poolResource: Resource[IO, Resource[IO, Session[IO]]] = { val connInfo = postgresConnectionInfo diff --git a/modules/skunk/js-jvm/src/test/scala/subscription/SubscriptionMapping.scala b/modules/skunk/js-jvm/src/test/scala/subscription/SubscriptionMapping.scala index c6de9a42..0029abd8 100644 --- a/modules/skunk/js-jvm/src/test/scala/subscription/SubscriptionMapping.scala +++ b/modules/skunk/js-jvm/src/test/scala/subscription/SubscriptionMapping.scala @@ -98,7 +98,7 @@ trait SubscriptionMapping[F[_]] extends SkunkMapping[F] { RootStream.computeChild("channel")((child, _, _) => for { s <- fs2.Stream.resource(pool) - id <- s.channel(id"city_channel").listen(256).map(_.value.toInt) + id <- s.channel(ident"city_channel").listen(256).map(_.value.toInt) } yield Unique(Filter(Eql(CityType / "id", Const(id)), child)).success) ) ) diff --git a/modules/skunk/js-jvm/src/test/scala/subscription/SubscriptionSuite.scala b/modules/skunk/js-jvm/src/test/scala/subscription/SubscriptionSuite.scala index 644fb7e3..c4277fd4 100644 --- a/modules/skunk/js-jvm/src/test/scala/subscription/SubscriptionSuite.scala +++ b/modules/skunk/js-jvm/src/test/scala/subscription/SubscriptionSuite.scala @@ -80,7 +80,7 @@ class SubscriptionSuite extends SkunkDatabaseSuite { // Send some notifications through Postgres, which will trigger queries on the subscription. _ <- pool.use { s => - val ch = s.channel(id"city_channel").contramap[Int](_.toString) + val ch = s.channel(ident"city_channel").contramap[Int](_.toString) List(101, 102, 103).traverse_(ch.notify) }