build(pollux, prism-agent): refine mercury dependency & bump to versi…

…on 0.5.0 (#122)

build(pollux): refine mercury dependency & bump to version 0.5.0
build(prism-agent): add mercury dependency removed from pollux

pollux/lib/project/Dependencies.scala

@@ -7,7 +7,7 @@ object Dependencies {
     val zioCatsInterop = "3.3.0"
     val prismSdk = "v1.3.3-snapshot-1657194253-992dd96"
     val iris = "0.1.0"
-    val mercury = "0.4.0"
+    val mercury = "0.5.0"
     val flyway = "9.7.0"
   }
 
@@ -25,21 +25,19 @@ object Dependencies {
     ExclusionRule(
       organization = "org.bouncycastle"
     )
-  //REMOVE private lazy val polluxVcJwt = "io.iohk.atala" %% "pollux-vc-jwt" % "0.1.0-SNAPSHOT" changing ()
+  // REMOVE private lazy val polluxVcJwt = "io.iohk.atala" %% "pollux-vc-jwt" % "0.1.0-SNAPSHOT" changing ()
 
   private lazy val irisClient = "io.iohk.atala" %% "iris-client" % Versions.iris
 
-  private lazy val mercuryModels = "io.iohk.atala" %% "mercury-data-models" % Versions.mercury
-  private lazy val mercuryAgent = "io.iohk.atala" %% "mercury-agent-didcommx" % Versions.mercury
-  private lazy val mercuryResolver = "io.iohk.atala" %% "mercury-resolver" % Versions.mercury
+  private lazy val mercuryProtocolIssueCredential =
+    "io.iohk.atala" %% "mercury-protocol-issue-credential" % Versions.mercury
 
   // Dependency Modules
   private lazy val baseDependencies: Seq[ModuleID] = Seq(zio, prismCrypto)
   private lazy val doobieDependencies: Seq[ModuleID] = Seq(doobiePostgres, doobieHikari, flyway)
-  private lazy val mercuryDependencies: Seq[ModuleID] = Seq(mercuryModels, mercuryAgent, mercuryResolver)
 
   // Project Dependencies
   lazy val coreDependencies: Seq[ModuleID] =
-    baseDependencies ++ Seq(irisClient) ++ mercuryDependencies
+    baseDependencies ++ Seq(irisClient) ++ Seq(mercuryProtocolIssueCredential)
   lazy val sqlDoobieDependencies: Seq[ModuleID] = baseDependencies ++ doobieDependencies ++ Seq(zioCatsInterop)
 }

prism-agent/service/project/Dependencies.scala

@@ -11,6 +11,7 @@ object Dependencies {
     val pollux = "0.1.0"
     val bouncyCastle = "1.70"
     val logback = "1.4.4"
+    val mercury = "0.5.0"
   }
 
   private lazy val zio = "dev.zio" %% "zio" % Versions.zio
@@ -35,6 +36,8 @@ object Dependencies {
   private lazy val polluxCore = "io.iohk.atala" %% "pollux-core" % Versions.pollux
   private lazy val polluxSqlDoobie = "io.iohk.atala" %% "pollux-sql-doobie" % Versions.pollux
 
+  private lazy val mercuryAgent = "io.iohk.atala" %% "mercury-agent-didcommx" % Versions.mercury
+
   // Added here to make prism-crypto works.
   // Once migrated to apollo, re-evaluate if this should be removed.
   private lazy val bouncyBcpkix = "org.bouncycastle" % "bcpkix-jdk15on" % Versions.bouncyCastle
@@ -47,15 +50,21 @@ object Dependencies {
     Seq(zio, zioTest, zioTestSbt, zioTestMagnolia, zioConfig, zioConfigMagnolia, zioConfigTypesafe)
   private lazy val castorDependencies: Seq[ModuleID] = Seq(castorCore, castorSqlDoobie)
   private lazy val polluxDependencies: Seq[ModuleID] = Seq(polluxCore, polluxSqlDoobie)
+  private lazy val mercuryDependencies: Seq[ModuleID] = Seq(mercuryAgent)
   private lazy val akkaHttpDependencies: Seq[ModuleID] =
     Seq(akkaTyped, akkaStream, akkaHttp, akkaSprayJson).map(_.cross(CrossVersion.for3Use2_13))
   private lazy val bouncyDependencies: Seq[ModuleID] = Seq(bouncyBcpkix, bouncyBcprov)
 
   // Project Dependencies
   lazy val keyManagementDependencies: Seq[ModuleID] = baseDependencies ++ castorDependencies ++ bouncyDependencies
   lazy val serverDependencies: Seq[ModuleID] =
-    baseDependencies ++ akkaHttpDependencies ++ castorDependencies ++ polluxDependencies ++ Seq(
-      zioHttp,
-      logback
-    )
+    baseDependencies ++
+      akkaHttpDependencies ++
+      castorDependencies ++
+      polluxDependencies ++
+      mercuryDependencies ++
+      Seq(
+        zioHttp,
+        logback
+      )
 }