Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: sbt and plugins dependency update #1337

Merged
merged 8 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.17
343e8a9fc72b5bb036ff5de7d78e4ca661d3daeb

# Scala Steward: Reformat with scalafmt 3.8.3
a9110aafdb5e6d26522ee297ab8cb357601ff091
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.1
version = 3.8.3
runner.dialect = scala3

maxColumn = 120
Expand Down
7 changes: 5 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ 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))
// ZIO.serviceWithZIO(_.packEncryptedAnon(msg, to))

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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading