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

chore: update SBT and Scala versions & Fixes #870

Merged
merged 3 commits into from
Oct 4, 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
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import sbtprotoc.ProtocPlugin.autoImport.PB
inThisBuild(
Seq(
organization := "io.iohk.atala",
scalaVersion := "2.13.7",
scalaVersion := "2.13.15",
fork := true,
run / connectInput := true,
versionScheme := Some("semver-spec"),
Expand Down Expand Up @@ -165,7 +165,7 @@ lazy val root =
javacOptions ++= Seq("-source", "1.11", "-target", "1.11"),
githubTokenSource := TokenSource.Environment("GITHUB_TOKEN"),
addCompilerPlugin(
"org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full
"org.typelevel" % "kind-projector" % "0.13.3" cross CrossVersion.full
),
Test / fork := true,
Test / parallelExecution := 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.6.2
sbt.version = 1.10.2
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.22")
addSbtPlugin("io.kamon" % "sbt-kanela-runner" % "2.0.13")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import tofu.syntax.monoid.TofuSemigroupOps
*/
object GeneralLoggableInstances {

implicit val statusLoggable = new DictLoggable[Status] {
implicit val statusLoggable: DictLoggable[Status] = new DictLoggable[Status] {
override def fields[I, V, R, S](a: Status, i: I)(implicit r: LogRenderer[I, V, R, S]): R = {
r.addString("grpc_status", a.toString, i)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ class BlockProcessingServiceImpl(applyOperationConfig: ApplyOperationConfig) ext
val result = for {
// Fetch key information and previous hash information
correctnessData <- operation.getCorrectnessData(protoOperation.signedWith)
CorrectnessData(key, previousOperation) = correctnessData
key = correctnessData.key
previousOperation = correctnessData.previousOperation
// Verify that operation has the correct hash of the previous operation
_ <- EitherT.cond[ConnectionIO](
operation.linkedPreviousOperation == previousOperation,
Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/io/iohk/atala/prism/node/NodeServiceSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ class NodeServiceSpec

// This changes greatly, so just test something was set
buildInfo.version must not be empty
buildInfo.scalaVersion mustBe "2.13.7"
buildInfo.sbtVersion mustBe "1.6.2"
buildInfo.scalaVersion mustBe "2.13.15"
buildInfo.sbtVersion mustBe "1.10.2"
}
}

Expand Down
Loading