diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index ab3b57b1d4..5be4ec8da4 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.7.17 343e8a9fc72b5bb036ff5de7d78e4ca661d3daeb + +# Scala Steward: Reformat with scalafmt 3.8.3 +a9110aafdb5e6d26522ee297ab8cb357601ff091 diff --git a/.scalafmt.conf b/.scalafmt.conf index 0a6c70a036..3639dd959b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.8.3 runner.dialect = scala3 maxColumn = 120 diff --git a/build.sbt b/build.sbt index a52297b4ff..c5361912fb 100644 --- a/build.sbt +++ b/build.sbt @@ -41,7 +41,7 @@ inThisBuild( ) lazy val V = new { - val munit = "1.0.0" // "0.7.29" + val munit = "1.0.1" // "0.7.29" val munitZio = "0.2.0" // https://mvnrepository.com/artifact/dev.zio/zio @@ -167,7 +167,10 @@ lazy val D = new { val scalaTest = "org.scalatest" %% "scalatest" % "3.2.16" % Test val apollo = Seq( // TODO remove exclude after fix https://github.com/hyperledger/identus-apollo/issues/192 - "io.iohk.atala.prism.apollo" % "apollo-jvm" % V.apollo exclude ("net.jcip", "jcip-annotations"), // Exclude because of license + "io.iohk.atala.prism.apollo" % "apollo-jvm" % V.apollo exclude ( + "net.jcip", + "jcip-annotations" + ), // Exclude because of license "com.github.stephenc.jcip" % "jcip-annotations" % "1.0-1" % Runtime, // Replace for net.jcip % jcip-annotations" ) diff --git a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala index 20710b1bf5..ef26cf8540 100644 --- a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala +++ b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala @@ -111,10 +111,10 @@ object MessagingService { } } yield (msgToSend) - /** Encrypt and send a Message via HTTP - * - * TODO Move this method to another model - */ + /** Encrypt and send a Message via HTTP + * + * TODO Move this method to another model + */ def send(msg: Message): ZIO[DidOps & DidAgent & DIDResolver & HttpClient, SendMessageError, HttpResponse] = ZIO.logAnnotate("msgId", msg.id) { for { diff --git a/mercury/models/src/main/scala/org/hyperledger/identus/mercury/DidOps.scala b/mercury/models/src/main/scala/org/hyperledger/identus/mercury/DidOps.scala index 9c0185548c..856612d7db 100644 --- a/mercury/models/src/main/scala/org/hyperledger/identus/mercury/DidOps.scala +++ b/mercury/models/src/main/scala/org/hyperledger/identus/mercury/DidOps.scala @@ -27,11 +27,11 @@ object DidOps { def packSigned(msg: Message): URIO[DidOps & DidAgent, SignedMesage] = ZIO.service[DidOps].flatMap(_.packSigned(msg)) - // ZIO.serviceWithZIO(_.packSigned(msg)) + // ZIO.serviceWithZIO(_.packSigned(msg)) def packEncrypted(msg: Message, to: DidId): URIO[DidOps & DidAgent, EncryptedMessage] = ZIO.service[DidOps].flatMap(_.packEncrypted(msg, to)) - // ZIO.serviceWithZIO(_.packEncrypted(msg, to)) + // ZIO.serviceWithZIO(_.packEncrypted(msg, to)) def packEncryptedAnon(msg: Message, to: DidId): URIO[DidOps & DidAgent, EncryptedMessage] = ZIO.service[DidOps].flatMap(_.packEncryptedAnon(msg, to)) @@ -39,7 +39,7 @@ object DidOps { def unpack(str: String): URIO[DidOps & DidAgent, UnpackMessage] = ZIO.service[DidOps].flatMap(_.unpack(str)) - // ZIO.serviceWithZIO(_.unpack(str)) + // ZIO.serviceWithZIO(_.unpack(str)) def unpackBase64(base64str: String): RIO[DidOps & DidAgent, UnpackMessage] = ZIO.service[DidOps].flatMap(_.unpackBase64(base64str)) diff --git a/mercury/protocol-issue-credential/src/test/scala/org/hyperledger/identus/mercury/protocol/issuecredential/IssueCredentialSpec.scala b/mercury/protocol-issue-credential/src/test/scala/org/hyperledger/identus/mercury/protocol/issuecredential/IssueCredentialSpec.scala index 90502fddd8..388bcf9894 100644 --- a/mercury/protocol-issue-credential/src/test/scala/org/hyperledger/identus/mercury/protocol/issuecredential/IssueCredentialSpec.scala +++ b/mercury/protocol-issue-credential/src/test/scala/org/hyperledger/identus/mercury/protocol/issuecredential/IssueCredentialSpec.scala @@ -21,7 +21,7 @@ class IssueCredentialSpec extends ZSuite { .deepDropNullValues .noSpaces - // FIXME !!! THIS WILL FAIL! + // FIXME !!! THIS WILL FAIL! val expectedProposalJson = parse( s"""{ | "id": "061bf917-2cbe-460b-8d12-b1a9609505c2", diff --git a/pollux/sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/JdbcCredentialRepository.scala b/pollux/sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/JdbcCredentialRepository.scala index dd9a5ea7c5..339e2946ad 100644 --- a/pollux/sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/JdbcCredentialRepository.scala +++ b/pollux/sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/JdbcCredentialRepository.scala @@ -29,7 +29,6 @@ class JdbcCredentialRepository(xa: Transactor[ContextAwareTask], xb: Transactor[ // Uncomment to have Doobie LogHandler in scope and automatically output SQL statements in logs // given logHandler: LogHandler = LogHandler.jdkLogHandler - import IssueCredentialRecord.* given credentialFormatGet: Get[CredentialFormat] = Get[String].map(CredentialFormat.valueOf) diff --git a/pollux/sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/JdbcPresentationRepository.scala b/pollux/sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/JdbcPresentationRepository.scala index d91de29b62..1e477640c1 100644 --- a/pollux/sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/JdbcPresentationRepository.scala +++ b/pollux/sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/JdbcPresentationRepository.scala @@ -114,7 +114,6 @@ class JdbcPresentationRepository( // Uncomment to have Doobie LogHandler in scope and automatically output SQL statements in logs // given logHandler: LogHandler = LogHandler.jdkLogHandler - import PresentationRecord.* def zioJsonToCirceJson(zioJson: Json): circe.Json = { diff --git a/project/plugins.sbt b/project/plugins.sbt index 6bfc5d042a..92cb4d7e27 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,9 +2,9 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12") -addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11") +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.13") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") // In order to import proper version of com.google.protobuf.ByteString we need to add this dependency