Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into kc/iam-upgrade
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.sbt
  • Loading branch information
kelvin-chappell committed Feb 25, 2025
2 parents abfb417 + 4cc7177 commit 68fc71c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.5
version = 3.8.6

runner.dialect = scala213
maxColumn = 80
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ThisBuild / licenses := Seq(License.Apache2)
val awsSdkVersion = "2.30.20"
val circeVersion = "0.14.10"
val commonDependencies = Seq(
"org.typelevel" %% "cats-core" % "2.12.0",
"joda-time" % "joda-time" % "2.13.0",
"org.typelevel" %% "cats-core" % "2.13.0",
"joda-time" % "joda-time" % "2.13.1",
"org.joda" % "joda-convert" % "3.0.1",
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
"org.scalacheck" %% "scalacheck" % "1.18.1" % Test,
Expand Down Expand Up @@ -79,7 +79,7 @@ lazy val root = (project in file("."))
libraryDependencies ++= commonDependencies ++ Seq(
ws,
filters,
"com.gu.play-googleauth" %% "play-v30" % "19.0.0",
"com.gu.play-googleauth" %% "play-v30" % "19.0.1",
"software.amazon.awssdk" % "iam" % awsSdkVersion,
"software.amazon.awssdk" % "sts" % awsSdkVersion,
"software.amazon.awssdk" % "dynamodb" % awsSdkVersion,
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"

addSbtPlugin(
"com.github.sbt" % "sbt-native-packager" % "1.11.0"
"com.github.sbt" % "sbt-native-packager" % "1.11.1"
)

// The Play plugin
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.6")

addSbtPlugin("com.github.sbt" % "sbt-digest" % "2.0.0")
addSbtPlugin("com.github.sbt" % "sbt-digest" % "2.1.0")

libraryDependencies += "org.vafer" % "jdeb" % "1.12" artifacts Artifact(
libraryDependencies += "org.vafer" % "jdeb" % "1.13" artifacts Artifact(
"jdeb",
"jar",
"jar"
Expand Down

0 comments on commit 68fc71c

Please sign in to comment.