Skip to content

Commit

Permalink
build: DAL dependency update (#1076)
Browse files Browse the repository at this point in the history
Signed-off-by: Hyperledger Bot <hyperledger-bot@hyperledger.org>
Signed-off-by: Pat Losoponkul <pat.losoponkul@iohk.io>
Co-authored-by: Hyperledger Bot <hyperledger-bot@hyperledger.org>
Co-authored-by: patlo-iog <pat.losoponkul@iohk.io>
  • Loading branch information
3 people committed May 22, 2024
1 parent 2fb7403 commit fec905d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 21 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ lazy val V = new {
val testContainersScala = "0.41.3"
val testContainersJavaKeycloak = "3.2.0" // scala-steward:off

val doobie = "1.0.0-RC2"
val quill = "4.7.3"
val doobie = "1.0.0-RC5"
val quill = "4.8.4"
val flyway = "9.22.3"
val postgresDriver = "42.2.29"
val postgresDriver = "42.7.3"
val logback = "1.4.14"
val slf4j = "2.0.13"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ package org.hyperledger.identus.pollux.anoncreds
import org.scalatest.flatspec.AnyFlatSpec

import scala.jdk.CollectionConverters.*
import org.hyperledger.identus.pollux.anoncreds.{
AnoncredLinkSecretWithId,
AnoncredLinkSecret,
AnoncredPresentationRequest,
AnoncredLib,
AnoncredCredentialRequests
}

/** polluxAnoncredsTest/Test/testOnly org.hyperledger.identus.pollux.anoncreds.PoCNewLib
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import cats.effect.kernel.Resource
import cats.effect.std.Dispatcher
import com.zaxxer.hikari.HikariConfig
import doobie.hikari.HikariTransactor
import doobie.util.ExecutionContexts
import doobie.util.transactor.Transactor
import zio.*
import zio.interop.catz.*
Expand All @@ -18,7 +17,7 @@ object TransactorLayer {
// Here we use `Dispatcher.apply`
// but at the agent level it is `Dispatcher.parallel` due to evicted version
// Dispatcher.parallel[Task].allocated.map { case (dispatcher, _) =>
Dispatcher[Task].allocated.map { case (dispatcher, _) =>
Dispatcher.parallel[Task].allocated.map { case (dispatcher, _) =>
given Dispatcher[Task] = dispatcher
TransactorLayer.hikari[Task](config)
}
Expand All @@ -34,7 +33,7 @@ object TransactorLayer {
// Here we use `Dispatcher.apply`
// but at the agent level it is `Dispatcher.parallel` due to evicted version
// Dispatcher.parallel[ContextAwareTask].allocated.map { case (dispatcher, _) =>
Dispatcher[ContextAwareTask].allocated.map { case (dispatcher, _) =>
Dispatcher.parallel[ContextAwareTask].allocated.map { case (dispatcher, _) =>
given Dispatcher[ContextAwareTask] = dispatcher
TransactorLayer.hikari[ContextAwareTask](config)
}
Expand All @@ -56,14 +55,7 @@ object TransactorLayer {
hikariConfig
}
.map { hikariConfig =>
val pool: Resource[A, Transactor[A]] = for {
// Resource yielding a transactor configured with a bounded connect EC and an unbounded
// transaction EC. Everything will be closed and shut down cleanly after use.
ec <- ExecutionContexts.fixedThreadPool[A](config.awaitConnectionThreads) // our connect EC
xa <- HikariTransactor.fromHikariConfig[A](hikariConfig, ec)
// xa <- HikariTransactor.fromHikariConfig[A](hikariConfig, Some(LogHandler.jdkLogHandler))
} yield xa

val pool: Resource[A, Transactor[A]] = HikariTransactor.fromHikariConfig[A](hikariConfig)
pool.toManaged.toLayer[Transactor[A]]
}

Expand Down

0 comments on commit fec905d

Please sign in to comment.