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 #1507

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
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.3
version = 3.8.6
runner.dialect = scala3

maxColumn = 120
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ inThisBuild(
)

lazy val V = new {
val munit = "1.0.2" // "0.7.29"
val munit = "1.0.4" // "0.7.29"
val munitZio = "0.2.0"

// https://mvnrepository.com/artifact/dev.zio/zio
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,9 @@ case class CredentialIssuerServerEndpoints(
}

val issuerMetadataServerEndpoint: ZServerEndpoint[Any, Any] = CredentialIssuerEndpoints.issuerMetadataEndpoint
.zServerLogic {
{ case (rc, didRef) => credentialIssuerController.getIssuerMetadata(rc, didRef).logTrace(rc) }
.zServerLogic { { case (rc, didRef) =>
credentialIssuerController.getIssuerMetadata(rc, didRef).logTrace(rc)
}
}

val all: List[ZServerEndpoint[Any, Any]] = List(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ class JdbcDIDNonSecretStorage(xa: Transactor[ContextAwareTask], xb: Transactor[T
case ManagedDIDKeyMeta.HD(k) => (k.keyUsage, Some(k.keyIndex), k.keyMode, k.curve)
case ManagedDIDKeyMeta.Rand(k) => (k.keyUsage, None, k.keyMode, k.curve)
}
val cxnIO = (now: Instant) => sql"""
val cxnIO = (now: Instant) =>
sql"""
| INSERT INTO public.prism_did_key(did, key_id, key_usage, key_index, created_at, operation_hash, key_mode, curve_name)
| VALUES
| (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ object ConnectionRepositorySpecSuite {
} yield {
assertTrue(res match
case Exit.Failure(cause: Cause.Die) => true
case _ => false
)
case _ => false)
}
},
test("getConnectionRecord correctly returns an existing record") {
Expand Down Expand Up @@ -213,8 +212,7 @@ object ConnectionRepositorySpecSuite {
} yield {
assertTrue(deleteResult match
case Exit.Failure(cause: Cause.Die) => true
case _ => false
) &&
case _ => false) &&
assertTrue(records.size == 2) &&
assertTrue(records.contains(aRecord.withWalletId(walletId))) &&
assertTrue(records.contains(bRecord.withWalletId(walletId)))
Expand Down Expand Up @@ -296,8 +294,7 @@ object ConnectionRepositorySpecSuite {
} yield {
assertTrue(updateResult match
case Exit.Failure(cause: Cause.Die) => true
case _ => false
) &&
case _ => false) &&
assertTrue(record.get.protocolState == ProtocolState.InvitationGenerated) &&
assertTrue(updatedRecord.get.protocolState == ProtocolState.InvitationGenerated)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,7 @@ object ConnectionServiceImplSpec extends ZIOSpecDefault {
} yield {
assertTrue(exit match
case Exit.Failure(Cause.Fail(_: InvalidStateForOperation, _)) => true
case _ => false
)
case _ => false)

}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ given Conversion[AttachmentDescriptor, XAttachment] with {
new XAttachment.Builder(id, data)
.format(attachment.format match
case Some(format) => format
case None => null
)
case None => null)
.build()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS
} yield {
assertTrue(record match
case Exit.Failure(Cause.Die(_: UnmanagedFailureException, _)) => true
case _ => false
)
case _ => false)
}
}
},
Expand Down Expand Up @@ -359,8 +358,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS
} yield {
assertTrue(exit match
case Exit.Failure(Cause.Fail(_: RecordNotFound, _)) => true
case _ => false
)
case _ => false)
}
},
test("acceptCredentialOffer should reject unsupported `subjectId` format") {
Expand All @@ -375,8 +373,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS
} yield {
assertTrue(record match
case Exit.Failure(Cause.Fail(_: UnsupportedDidFormat, _)) => true
case _ => false
)
case _ => false)
}
},
test("receiveCredentialRequest successfully updates the record") {
Expand All @@ -402,8 +399,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS
} yield {
assertTrue(exit match
case Exit.Failure(Cause.Fail(_: RecordNotFoundForThreadIdAndStates, _)) => true
case _ => false
)
case _ => false)
}
},
test("receiveCredentialRequest is rejected for an unknown 'thid'") {
Expand All @@ -416,8 +412,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS
} yield {
assertTrue(exit match
case Exit.Failure(Cause.Fail(_: RecordNotFoundForThreadIdAndStates, _)) => true
case _ => false
)
case _ => false)
}
},
test("acceptCredentialRequest successfully updates the record") {
Expand Down Expand Up @@ -445,8 +440,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS
} yield {
assertTrue(exit match
case Exit.Failure(Cause.Fail(_: RecordNotFound, _)) => true
case _ => false
)
case _ => false)
}
},
test("receiveCredentialIssue successfully updates the record") {
Expand Down Expand Up @@ -480,8 +474,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS
} yield {
assertTrue(exit match
case Exit.Failure(Cause.Fail(_: RecordNotFoundForThreadIdAndStates, _)) => true
case _ => false
)
case _ => false)
}
}.provideSomeLayer(holderDidServiceExpectations.toLayer ++ holderManagedDIDServiceExpectations.toLayer),
test("receiveCredentialIssue is rejected for an unknown 'thid'") {
Expand All @@ -498,8 +491,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS
} yield {
assertTrue(exit match
case Exit.Failure(Cause.Fail(_: RecordNotFoundForThreadIdAndStates, _)) => true
case _ => false
)
case _ => false)
}
}.provideSomeLayer(holderDidServiceExpectations.toLayer ++ holderManagedDIDServiceExpectations.toLayer),
test("Happy flow is successfully executed") {
Expand Down Expand Up @@ -688,8 +680,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS
case MyBase64(value) =>
val ba = new String(Base64.getUrlDecoder.decode(value))
AnoncredCredential(ba).credDefId == credDefId
case _ => false
)
case _ => false)
}
}
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.7
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
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.4")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.14")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15")
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