From eddd67a2cc9aff5c6c350f8a2805058fba505387 Mon Sep 17 00:00:00 2001 From: FabioPinheiro Date: Wed, 17 Apr 2024 16:54:14 +0100 Subject: [PATCH] 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 --- build.sbt | 15 ++++++++------- .../prism/logging/GeneralLoggableInstances.scala | 2 +- .../repositories/daos/CredentialBatchesDAO.scala | 1 - .../iohk/atala/prism/node/NodeServiceSpec.scala | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index 872fd3c571..c57ffb3666 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ import sbtprotoc.ProtocPlugin.autoImport.PB inThisBuild( Seq( organization := "io.iohk.atala", - scalaVersion := "2.13.7", + scalaVersion := "2.13.13", fork := true, run / connectInput := true, versionScheme := Some("semver-spec"), @@ -50,7 +50,8 @@ lazy val versions = new { val typesafeConfig = "1.4.2" val fs2 = "3.2.5" val scalaUri = "4.0.0" - val prismSdk = "v1.4.1-snapshot-1688975371-7541fd2" // deployed to github packages from sdk branch "node-1.4-extension-sdk" + val prismSdk = + "v1.4.1-snapshot-1688975371-7541fd2" // deployed to github packages from sdk branch "node-1.4-extension-sdk" val vaultSdk = "0.1.0-build-2-96cc137d" } @@ -108,9 +109,9 @@ lazy val Dependencies = new { // We have to exclude bouncycastle since for some reason bitcoinj depends on bouncycastle jdk15to18 // (i.e. JDK 1.5 to 1.8), but we are using JDK 11 val prismCredentials = - "io.iohk.atala" % "prism-credentials-jvm" % versions.prismSdk excludeAll ExclusionRule( - organization = "org.bouncycastle" - ) + "io.iohk.atala" % "prism-credentials-jvm" % versions.prismSdk excludeAll ExclusionRule( + organization = "org.bouncycastle" + ) val prismProtos = "io.iohk.atala" % "prism-protos-jvm" % versions.prismSdk % "protobuf-src" intransitive () val vaultProtos = @@ -190,7 +191,7 @@ lazy val commonSettings = Seq( "-Ywarn-dead-code" ) ) - ), + ), scalacOptions += "-Ymacro-annotations", javacOptions ++= Seq("-source", "1.11", "-target", "1.11"), githubTokenSource := TokenSource.Environment("GITHUB_TOKEN"), @@ -201,7 +202,7 @@ lazy val commonSettings = Seq( "JetBrains Space Maven Repository" at "https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven", libraryDependencies ++= Dependencies.scalatestDependencies, 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, diff --git a/common/src/main/scala/io/iohk/atala/prism/logging/GeneralLoggableInstances.scala b/common/src/main/scala/io/iohk/atala/prism/logging/GeneralLoggableInstances.scala index ae6507bd58..654fa509ab 100644 --- a/common/src/main/scala/io/iohk/atala/prism/logging/GeneralLoggableInstances.scala +++ b/common/src/main/scala/io/iohk/atala/prism/logging/GeneralLoggableInstances.scala @@ -12,7 +12,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) } diff --git a/node/src/main/scala/io/iohk/atala/prism/node/repositories/daos/CredentialBatchesDAO.scala b/node/src/main/scala/io/iohk/atala/prism/node/repositories/daos/CredentialBatchesDAO.scala index d42e28c764..aa35cac134 100644 --- a/node/src/main/scala/io/iohk/atala/prism/node/repositories/daos/CredentialBatchesDAO.scala +++ b/node/src/main/scala/io/iohk/atala/prism/node/repositories/daos/CredentialBatchesDAO.scala @@ -10,7 +10,6 @@ import io.iohk.atala.prism.crypto.MerkleRoot import io.iohk.atala.prism.crypto.Sha256Digest import io.iohk.atala.prism.models.{DidSuffix, Ledger, TransactionId} import io.iohk.atala.prism.node.models.nodeState.{CredentialBatchState, LedgerData} -import io.iohk.atala.prism.node.repositories.daos._ import doobie.implicits.legacy.instant._ import io.iohk.atala.prism.interop.implicits._ import io.iohk.atala.prism.utils.syntax._ diff --git a/node/src/test/scala/io/iohk/atala/prism/node/NodeServiceSpec.scala b/node/src/test/scala/io/iohk/atala/prism/node/NodeServiceSpec.scala index f49f21b8fa..dac4d5e31a 100644 --- a/node/src/test/scala/io/iohk/atala/prism/node/NodeServiceSpec.scala +++ b/node/src/test/scala/io/iohk/atala/prism/node/NodeServiceSpec.scala @@ -417,8 +417,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.13" + buildInfo.sbtVersion mustBe "1.9.9" } } diff --git a/project/build.properties b/project/build.properties index f6acff8b34..49214c4bb4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.6.2 +sbt.version = 1.9.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index 23309e6faa..70416ca44b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11") 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")