diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..f8b884f464 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.17 +2358f621cdf48de91638fe574b596757c3a44df3 diff --git a/.scalafmt.conf b/.scalafmt.conf index ed18d7a699..7fcd55e989 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.10 +version = 3.7.17 runner.dialect = scala3 maxColumn = 120 diff --git a/build.sbt b/build.sbt index 331fef7031..21ce6e47ff 100644 --- a/build.sbt +++ b/build.sbt @@ -43,49 +43,49 @@ inThisBuild( ) lazy val V = new { - val munit = "1.0.0-M8" // "0.7.29" - val munitZio = "0.1.1" + val munit = "1.0.0-M10" // "0.7.29" + val munitZio = "0.2.0" // https://mvnrepository.com/artifact/dev.zio/zio - val zio = "2.0.18" - val zioConfig = "3.0.7" - val zioLogging = "2.0.1" - val zioJson = "0.3.0" - val zioHttp = "3.0.0-RC2" - val zioCatsInterop = "3.3.0" - val zioMetricsConnector = "2.1.0" - val zioMock = "1.0.0-RC11" - val mockito = "3.2.16.0" + val zio = "2.0.21" + val zioConfig = "4.0.1" + val zioLogging = "2.2.0" + val zioJson = "0.6.2" + val zioHttp = "3.0.0-RC4" + val zioCatsInterop = "23.1.0.0" + val zioMetricsConnector = "2.3.1" + val zioMock = "1.0.0-RC12" + val mockito = "3.2.17.0" // https://mvnrepository.com/artifact/io.circe/circe-core val circe = "0.14.6" - val tapir = "1.6.4" + val tapir = "1.9.6" - val typesafeConfig = "1.4.2" + val typesafeConfig = "1.4.3" val protobuf = "3.1.9" val testContainersScala = "0.41.0" val testContainersJavaKeycloak = "3.0.0" // scala-steward:off - val doobie = "1.0.0-RC2" - val quill = "4.7.3" - val flyway = "9.8.3" - val postgresDriver = "42.2.27" - val logback = "1.4.8" - val slf4j = "2.0.7" + val doobie = "1.0.0-RC5" + val quill = "4.8.1" + val flyway = "9.22.3" + val postgresDriver = "42.7.1" + val logback = "1.4.14" + val slf4j = "2.0.11" val prismSdk = "1.4.1" // scala-steward:off val scalaUri = "4.0.3" - val jwtCirceVersion = "9.1.2" - val zioPreludeVersion = "1.0.0-RC16" + val jwtCirceVersion = "9.4.6" + val zioPreludeVersion = "1.0.0-RC22" - val bouncyCastle = "1.70" + val bouncyCastle = "1.77" - val jsonSchemaValidator = "1.0.86" + val jsonSchemaValidator = "1.0.88" - val vaultDriver = "6.1.0" - val micrometer = "1.11.2" + val vaultDriver = "6.2.0" + val micrometer = "1.11.8" val nimbusJwt = "10.0.0" val keycloak = "22.0.4" // scala-steward:off @@ -116,8 +116,8 @@ lazy val D = new { val jwtCirce = "com.github.jwt-scala" %% "jwt-circe" % V.jwtCirceVersion // https://mvnrepository.com/artifact/org.didcommx/didcomm/0.3.2 - val didcommx: ModuleID = "org.didcommx" % "didcomm" % "0.3.1" - val peerDidcommx: ModuleID = "org.didcommx" % "peerdid" % "0.3.0" + val didcommx: ModuleID = "org.didcommx" % "didcomm" % "0.3.2" + val peerDidcommx: ModuleID = "org.didcommx" % "peerdid" % "0.4.1" val didScala: ModuleID = "app.fmgp" %% "did" % "0.0.0+113-61efa271-SNAPSHOT" // Customized version of numbus jose jwt @@ -288,7 +288,7 @@ lazy val D_Pollux = new { lazy val D_Pollux_VC_JWT = new { - private lazy val circeJsonSchema = ("net.reactivecore" %% "circe-json-schema" % "0.3.0") + private lazy val circeJsonSchema = ("net.reactivecore" %% "circe-json-schema" % "0.4.1") .cross(CrossVersion.for3Use2_13) .exclude("io.circe", "circe-core_2.13") .exclude("io.circe", "circe-generic_2.13") @@ -303,7 +303,7 @@ lazy val D_Pollux_VC_JWT = new { val zioTestSbt = "dev.zio" %% "zio-test-sbt" % V.zio % Test val zioTestMagnolia = "dev.zio" %% "zio-test-magnolia" % V.zio % Test - val scalaTest = "org.scalatest" %% "scalatest" % "3.2.16" % Test + val scalaTest = "org.scalatest" %% "scalatest" % "3.2.17" % Test // Dependency Modules val zioDependencies: Seq[ModuleID] = Seq(zio, zioPrelude, zioTest, zioTestSbt, zioTestMagnolia) @@ -334,8 +334,8 @@ lazy val D_PrismAgent = new { // Added here to make prism-crypto works. // Once migrated to apollo, re-evaluate if this should be removed. - val bouncyBcpkix = "org.bouncycastle" % "bcpkix-jdk15on" % V.bouncyCastle - val bouncyBcprov = "org.bouncycastle" % "bcprov-jdk15on" % V.bouncyCastle + val bouncyBcpkix = "org.bouncycastle" % "bcpkix-jdk18on" % V.bouncyCastle + val bouncyBcprov = "org.bouncycastle" % "bcprov-jdk18on" % V.bouncyCastle val logback = "ch.qos.logback" % "logback-classic" % V.logback @@ -344,13 +344,13 @@ lazy val D_PrismAgent = new { val tapirZioHttpServer = "com.softwaremill.sttp.tapir" %% "tapir-zio-http-server" % V.tapir val tapirHttp4sServerZio = "com.softwaremill.sttp.tapir" %% "tapir-http4s-server-zio" % V.tapir - val http4sBlazeServer = "org.http4s" %% "http4s-blaze-server" % "0.23.12" + val http4sBlazeServer = "org.http4s" %% "http4s-blaze-server" % "0.23.16" val tapirRedocBundle = "com.softwaremill.sttp.tapir" %% "tapir-redoc-bundle" % V.tapir val tapirSttpStubServer = "com.softwaremill.sttp.tapir" %% "tapir-sttp-stub-server" % V.tapir % Test - val sttpClient3ZioJson = "com.softwaremill.sttp.client3" %% "zio-json" % "3.8.3" % Test + val sttpClient3ZioJson = "com.softwaremill.sttp.client3" %% "zio-json" % "3.8.16" % Test val quillDoobie = "io.getquill" %% "quill-doobie" % V.quill exclude ("org.scala-lang.modules", "scala-java8-compat_3") @@ -652,7 +652,7 @@ lazy val agentDidcommx = project lazy val agentCliDidcommx = project .in(file("mercury/mercury-library/agent-cli-didcommx")) .settings(name := "mercury-agent-cli-didcommx") - .settings(libraryDependencies += "com.google.zxing" % "core" % "3.5.0") + .settings(libraryDependencies += "com.google.zxing" % "core" % "3.5.2") .settings(libraryDependencies += D.zioHttp) .dependsOn(agentDidcommx) diff --git a/infrastructure/shared/docker-compose-mt-keycloak.yml b/infrastructure/shared/docker-compose-mt-keycloak.yml index d4f367b75d..9a19adc310 100644 --- a/infrastructure/shared/docker-compose-mt-keycloak.yml +++ b/infrastructure/shared/docker-compose-mt-keycloak.yml @@ -147,7 +147,7 @@ services: - swagger-ui keycloak: - image: quay.io/keycloak/keycloak:22.0.4 + image: quay.io/keycloak/keycloak:22.0.5 ports: - "9980:8080" environment: diff --git a/prism-agent/service/server/src/main/scala/io/iohk/atala/iam/authentication/oidc/KeycloakClient.scala b/prism-agent/service/server/src/main/scala/io/iohk/atala/iam/authentication/oidc/KeycloakClient.scala index 9b5953709b..e2cc4b18da 100644 --- a/prism-agent/service/server/src/main/scala/io/iohk/atala/iam/authentication/oidc/KeycloakClient.scala +++ b/prism-agent/service/server/src/main/scala/io/iohk/atala/iam/authentication/oidc/KeycloakClient.scala @@ -57,7 +57,7 @@ class KeycloakClientImpl(client: AuthzClient, httpClient: Client, override val k private val baseFormHeaders = Headers(Header.ContentType(MediaType.application.`x-www-form-urlencoded`)) // TODO: support offline introspection - // https://www.keycloak.org/docs/22.0.4/securing_apps/#_token_introspection_endpoint + // https://www.keycloak.org/docs/22.0.5/securing_apps/#_token_introspection_endpoint override def introspectToken(token: AccessToken): IO[KeycloakClientError, TokenIntrospection] = { for { response <- Client diff --git a/project/LicenseReport.scala b/project/LicenseReport.scala index 2bebfcbbc0..11a5b9ceea 100644 --- a/project/LicenseReport.scala +++ b/project/LicenseReport.scala @@ -48,8 +48,7 @@ class LicenseReportCustomDependencyResolution(ivyConfiguration: IvyConfiguration log.warn(":::::::::::::::::::::::::::::::::::::::::::::::::::") log.warn(":: LicenseReport Unresolved Dependencies ::") log.warn(":::::::::::::::::::::::::::::::::::::::::::::::::::") - resolveException - .failed + resolveException.failed .map(_.toString()) .distinct .sorted diff --git a/project/build.properties b/project/build.properties index e8a1e246e8..abbbce5da4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.8 diff --git a/project/build.sbt b/project/build.sbt index 1018b79544..d0e566359d 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,4 +1,7 @@ // Using unreleased plugin from 'main' which accepts DependencyResolution interface for building license report. -lazy val sbtLicenseReportPlugin = ProjectRef(uri("https://github.com/sbt/sbt-license-report.git#9675cedb19c794de1119cbcf46a255fc8dcd5d4e"), "sbt-license-report") +lazy val sbtLicenseReportPlugin = ProjectRef( + uri("https://github.com/sbt/sbt-license-report.git#9675cedb19c794de1119cbcf46a255fc8dcd5d4e"), + "sbt-license-report" +) lazy val root = (project in file(".")).dependsOn(sbtLicenseReportPlugin) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5ccae979d2..6639d63098 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,11 +1,11 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6") -addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.9") -addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11") +addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7") // In order to import proper version of com.google.protobuf.ByteString we need to add this dependency -libraryDependencies ++= Seq("com.thesamet.scalapb" %% "compilerplugin" % "0.11.13") +libraryDependencies ++= Seq("com.thesamet.scalapb" %% "compilerplugin" % "0.11.14") diff --git a/shared-test/src/test/scala/io/iohk/atala/sharedtest/containers/KeycloakTestContainer.scala b/shared-test/src/test/scala/io/iohk/atala/sharedtest/containers/KeycloakTestContainer.scala index 27274f589d..0d5d119bbf 100644 --- a/shared-test/src/test/scala/io/iohk/atala/sharedtest/containers/KeycloakTestContainer.scala +++ b/shared-test/src/test/scala/io/iohk/atala/sharedtest/containers/KeycloakTestContainer.scala @@ -4,7 +4,7 @@ import org.testcontainers.utility.DockerImageName object KeycloakTestContainer { def keycloakContainer( - imageName: String = "quay.io/keycloak/keycloak:22.0.4", + imageName: String = "quay.io/keycloak/keycloak:22.0.5", ): KeycloakContainerCustom = { val isOnGithubRunner = sys.env.contains("GITHUB_NETWORK") val container = diff --git a/tests/integration-tests/src/test/resources/containers/keycloak.yml b/tests/integration-tests/src/test/resources/containers/keycloak.yml index b98a83db3f..f79d5bb1b9 100644 --- a/tests/integration-tests/src/test/resources/containers/keycloak.yml +++ b/tests/integration-tests/src/test/resources/containers/keycloak.yml @@ -4,7 +4,7 @@ version: "3.8" services: keycloak: - image: quay.io/keycloak/keycloak:22.0.4 + image: quay.io/keycloak/keycloak:22.0.5 ports: - "${KEYCLOAK_HTTP_PORT}:8080" environment: