Skip to content

Commit

Permalink
Merge pull request #739 from nationalarchives/update/scala-steward-de…
Browse files Browse the repository at this point in the history
…pendencies/logback-classic-1.4.14

Update logback-classic to 1.4.14 in scala-steward-dependencies
  • Loading branch information
Tom-Hallett authored Feb 26, 2024
2 parents f9bf3b9 + a0faf31 commit 6baade6
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
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
f85cda71d9ef847f87417a44448e27554c3bc094
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.14
version = 3.7.17
preset = default
runner.dialect = scala213
maxColumn = 180
30 changes: 15 additions & 15 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ graphqlSchemaSnippet := "uk.gov.nationalarchives.tdr.api.graphql.GraphQlTypes.sc

lazy val akkaHttpVersion = "10.6.0-M1"
lazy val circeVersion = "0.14.6"
lazy val testContainersVersion = "0.41.0"
lazy val testContainersVersion = "0.41.3"

libraryDependencies ++= Seq(
"org.sangria-graphql" %% "sangria" % "4.0.2",
"org.sangria-graphql" %% "sangria" % "4.1.0",
"org.sangria-graphql" %% "sangria-slowlog" % "3.0.0",
"org.sangria-graphql" %% "sangria-circe" % "1.3.2",
"org.sangria-graphql" %% "sangria-spray-json" % "1.0.3",
Expand All @@ -58,31 +58,31 @@ libraryDependencies ++= Seq(
"io.circe" %% "circe-optics" % "0.15.0",
"io.circe" %% "circe-generic" % circeVersion,
"io.circe" %% "circe-generic-extras" % "0.14.3",
"com.softwaremill.sttp.client3" %% "core" % "3.9.0",
"com.softwaremill.sttp.client3" %% "core" % "3.9.3",
"uk.gov.nationalarchives" %% "consignment-api-db" % "0.1.40",
"uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.10",
"org.postgresql" % "postgresql" % "42.6.0",
"uk.gov.nationalarchives" %% "tdr-metadata-validation" % "0.0.14",
"org.postgresql" % "postgresql" % "42.6.1",
"com.typesafe.slick" %% "slick" % "3.4.1",
"com.typesafe.slick" %% "slick-hikaricp" % "3.4.1",
"ch.megard" %% "akka-http-cors" % "1.2.0",
"ch.qos.logback" % "logback-classic" % "1.4.11",
"ch.qos.logback" % "logback-classic" % "1.4.14",
"net.logstash.logback" % "logstash-logback-encoder" % "7.4",
"com.lightbend.akka" %% "akka-stream-alpakka-slick" % "6.0.2",
"software.amazon.awssdk" % "rds" % "2.21.0",
"software.amazon.awssdk" % "sts" % "2.21.0",
"software.amazon.awssdk" % "rds" % "2.21.46",
"software.amazon.awssdk" % "sts" % "2.21.46",
"com.github.cb372" %% "scalacache-caffeine" % "0.28.0",
"uk.gov.nationalarchives.oci" % "oci-tools-scala_2.13" % "0.3.0",
"org.scalatest" %% "scalatest" % "3.2.17" % Test,
"org.mockito" %% "mockito-scala" % "1.17.27" % Test,
"org.mockito" %% "mockito-scala-scalatest" % "1.17.27" % Test,
"uk.gov.nationalarchives.oci" % "oci-tools-scala_2.13" % "0.4.0",
"org.scalatest" %% "scalatest" % "3.2.18" % Test,
"org.mockito" %% "mockito-scala" % "1.17.30" % Test,
"org.mockito" %% "mockito-scala-scalatest" % "1.17.30" % Test,
"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % Test,
"com.typesafe.akka" %% "akka-testkit" % "2.9.0-M2" % Test,
"com.tngtech.keycloakmock" % "mock" % "0.16.0" % Test,
"uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.171",
"io.github.hakky54" % "logcaptor" % "2.9.0" % Test,
"uk.gov.nationalarchives" %% "tdr-auth-utils" % "0.0.190",
"io.github.hakky54" % "logcaptor" % "2.9.2" % Test,
"com.dimafeng" %% "testcontainers-scala-scalatest" % testContainersVersion % Test,
"com.dimafeng" %% "testcontainers-scala-postgresql" % testContainersVersion % Test,
"com.github.tomakehurst" % "wiremock-standalone" % "3.0.1" % Test,
"com.github.tomakehurst" % "wiremock-standalone" % "3.0.1" % Test
)

dependencyOverrides ++= Seq(
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.6
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("rocks.muki" % "sbt-graphql" % "0.16.0")

0 comments on commit 6baade6

Please sign in to comment.