Skip to content

Commit eddd67a

Browse files
committed
build: Update Scala and SBT version
Update Scala version to 2.13.13 Update SBT version to 1.9.9 Update kind-projector version to 0.13.3 Minor fixs
1 parent 15e6865 commit eddd67a

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

build.sbt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import sbtprotoc.ProtocPlugin.autoImport.PB
99
inThisBuild(
1010
Seq(
1111
organization := "io.iohk.atala",
12-
scalaVersion := "2.13.7",
12+
scalaVersion := "2.13.13",
1313
fork := true,
1414
run / connectInput := true,
1515
versionScheme := Some("semver-spec"),
@@ -50,7 +50,8 @@ lazy val versions = new {
5050
val typesafeConfig = "1.4.2"
5151
val fs2 = "3.2.5"
5252
val scalaUri = "4.0.0"
53-
val prismSdk = "v1.4.1-snapshot-1688975371-7541fd2" // deployed to github packages from sdk branch "node-1.4-extension-sdk"
53+
val prismSdk =
54+
"v1.4.1-snapshot-1688975371-7541fd2" // deployed to github packages from sdk branch "node-1.4-extension-sdk"
5455
val vaultSdk = "0.1.0-build-2-96cc137d"
5556
}
5657

@@ -108,9 +109,9 @@ lazy val Dependencies = new {
108109
// We have to exclude bouncycastle since for some reason bitcoinj depends on bouncycastle jdk15to18
109110
// (i.e. JDK 1.5 to 1.8), but we are using JDK 11
110111
val prismCredentials =
111-
"io.iohk.atala" % "prism-credentials-jvm" % versions.prismSdk excludeAll ExclusionRule(
112-
organization = "org.bouncycastle"
113-
)
112+
"io.iohk.atala" % "prism-credentials-jvm" % versions.prismSdk excludeAll ExclusionRule(
113+
organization = "org.bouncycastle"
114+
)
114115
val prismProtos =
115116
"io.iohk.atala" % "prism-protos-jvm" % versions.prismSdk % "protobuf-src" intransitive ()
116117
val vaultProtos =
@@ -190,7 +191,7 @@ lazy val commonSettings = Seq(
190191
"-Ywarn-dead-code"
191192
)
192193
)
193-
),
194+
),
194195
scalacOptions += "-Ymacro-annotations",
195196
javacOptions ++= Seq("-source", "1.11", "-target", "1.11"),
196197
githubTokenSource := TokenSource.Environment("GITHUB_TOKEN"),
@@ -201,7 +202,7 @@ lazy val commonSettings = Seq(
201202
"JetBrains Space Maven Repository" at "https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven",
202203
libraryDependencies ++= Dependencies.scalatestDependencies,
203204
addCompilerPlugin(
204-
"org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full
205+
"org.typelevel" % "kind-projector" % "0.13.3" cross CrossVersion.full
205206
),
206207
Test / fork := true,
207208
Test / parallelExecution := false,

common/src/main/scala/io/iohk/atala/prism/logging/GeneralLoggableInstances.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import tofu.syntax.monoid.TofuSemigroupOps
1212
*/
1313
object GeneralLoggableInstances {
1414

15-
implicit val statusLoggable = new DictLoggable[Status] {
15+
implicit val statusLoggable: DictLoggable[Status] = new DictLoggable[Status] {
1616
override def fields[I, V, R, S](a: Status, i: I)(implicit r: LogRenderer[I, V, R, S]): R = {
1717
r.addString("grpc_status", a.toString, i)
1818
}

node/src/main/scala/io/iohk/atala/prism/node/repositories/daos/CredentialBatchesDAO.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import io.iohk.atala.prism.crypto.MerkleRoot
1010
import io.iohk.atala.prism.crypto.Sha256Digest
1111
import io.iohk.atala.prism.models.{DidSuffix, Ledger, TransactionId}
1212
import io.iohk.atala.prism.node.models.nodeState.{CredentialBatchState, LedgerData}
13-
import io.iohk.atala.prism.node.repositories.daos._
1413
import doobie.implicits.legacy.instant._
1514
import io.iohk.atala.prism.interop.implicits._
1615
import io.iohk.atala.prism.utils.syntax._

node/src/test/scala/io/iohk/atala/prism/node/NodeServiceSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,8 @@ class NodeServiceSpec
417417

418418
// This changes greatly, so just test something was set
419419
buildInfo.version must not be empty
420-
buildInfo.scalaVersion mustBe "2.13.7"
421-
buildInfo.sbtVersion mustBe "1.6.2"
420+
buildInfo.scalaVersion mustBe "2.13.13"
421+
buildInfo.sbtVersion mustBe "1.9.9"
422422
}
423423
}
424424

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.6.2
1+
sbt.version = 1.9.9

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
2-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
2+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
33
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.22")
44
addSbtPlugin("io.kamon" % "sbt-kanela-runner" % "2.0.13")
55
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")

0 commit comments

Comments
 (0)