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: scala-steward dependency updates #707

Closed
wants to merge 44 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
c947abe
Update logback-classic to 1.4.14 in main
atala-dev Jan 21, 2024
cdb00be
Update jwt-circe to 9.4.6 in main
atala-dev Jan 21, 2024
f9100b1
Update munit-zio to 0.2.0 in main
atala-dev Jan 21, 2024
eff559e
Update sbt-native-packager to 1.9.16 in main
atala-dev Jan 21, 2024
bde6771
Update zxing:core to 3.5.2 in main
atala-dev Jan 21, 2024
1147a94
Update json-schema-validator to 1.0.88 in main
atala-dev Jan 21, 2024
060a061
Update zio-json to 3.8.16 in main
atala-dev Jan 21, 2024
c4f7d0f
Update tapir-http4s-server-zio to 1.9.6 in main
atala-dev Jan 21, 2024
2446a60
Update sbt-protoc to 1.0.7 in main
atala-dev Jan 21, 2024
8ee77a4
Update compilerplugin to 0.11.14 in main
atala-dev Jan 21, 2024
6fe9543
Update typesafe:config to 1.4.3 in main
atala-dev Jan 21, 2024
2667485
Update zio to 2.0.21 in main
atala-dev Jan 21, 2024
49b66c9
Update zio-config to 4.0.1 in main
atala-dev Jan 21, 2024
8ef7f7e
Update zio-http to 3.0.0-RC4 in main
atala-dev Jan 21, 2024
4f6fb01
Update zio-interop-cats to 23.1.0.0 in main
atala-dev Jan 21, 2024
b65153c
Update zio-json to 0.6.2 in main
atala-dev Jan 21, 2024
287e7b1
Update zio-logging to 2.2.0 in main
atala-dev Jan 21, 2024
a41d20b
Update zio-metrics-connectors-micrometer to 2.3.1 in main
atala-dev Jan 21, 2024
62dec7b
Update zio-mock to 1.0.0-RC12 in main
atala-dev Jan 21, 2024
0fae901
Update zio-prelude to 1.0.0-RC22 in main
atala-dev Jan 21, 2024
ecbc6de
Update quill-doobie to 4.8.1 in main
atala-dev Jan 21, 2024
a2234d3
Update vault-java-driver to 6.2.0 in main
atala-dev Jan 21, 2024
34e3d10
Update micrometer-core to 1.11.8 in main
atala-dev Jan 21, 2024
9296ab6
Update circe-json-schema to 0.4.1 in main
atala-dev Jan 21, 2024
77024d8
Update bcpkix-jdk15on to 1.77 in main
atala-dev Jan 21, 2024
9fd02a5
Update bcprov-jdk15on to 1.77 in main
atala-dev Jan 21, 2024
7c69e7b
Update didcomm to 0.3.2 in main
atala-dev Jan 21, 2024
fe7c39a
Update peerdid to 0.4.1 in main
atala-dev Jan 21, 2024
e6cf97f
Update flyway-core to 9.22.3 in main
atala-dev Jan 21, 2024
bab6028
Update http4s-blaze-server to 0.23.16 in main
atala-dev Jan 21, 2024
3090f34
Update keycloak-authz-client to 22.0.5 in main
atala-dev Jan 21, 2024
52d7224
Update postgresql to 42.7.1 in main
atala-dev Jan 21, 2024
8f24aa1
Update sbt to 1.9.8 in main
atala-dev Jan 21, 2024
35e4bcb
Update munit to 1.0.0-M10 in main
atala-dev Jan 21, 2024
dc86de2
Update sbt-scalafmt to 2.5.2 in main
atala-dev Jan 21, 2024
2f3511e
Update scalafmt-core to 3.7.17 in main
atala-dev Jan 21, 2024
2358f62
Reformat with scalafmt 3.7.17
atala-dev Jan 21, 2024
0af1508
Add 'Reformat with scalafmt 3.7.17' to .git-blame-ignore-revs
atala-dev Jan 21, 2024
e8f896f
Update scalatest to 3.2.17 in main
atala-dev Jan 21, 2024
981f36a
Update mockito-4-11 to 3.2.17.0 in main
atala-dev Jan 21, 2024
be9acf3
Update sbt-coveralls to 1.3.11 in main
atala-dev Jan 21, 2024
d9a009c
Update sbt-scoverage to 2.0.9 in main
atala-dev Jan 21, 2024
155d0c8
Update slf4j-api to 2.0.11 in main
atala-dev Jan 21, 2024
0cec696
Update doobie-hikari to 1.0.0-RC5 in main
atala-dev Jan 21, 2024
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
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.17
2358f621cdf48de91638fe574b596757c3a44df3
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.10
version = 3.7.17
runner.dialect = scala3

maxColumn = 120
Expand Down
68 changes: 34 additions & 34 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand All @@ -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)
Expand Down Expand Up @@ -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

Expand All @@ -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")
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion infrastructure/shared/docker-compose-mt-keycloak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions project/LicenseReport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
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.9.7
sbt.version=1.9.8
5 changes: 4 additions & 1 deletion project/build.sbt
Original file line number Diff line number Diff line change
@@ -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)
12 changes: 6 additions & 6 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading