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

chore(deps): Non-AWS dependency updates #817

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Matches the version here
# https://github.com/wellcomecollection/dockerfiles/blob/master/scalafmt/Dockerfile#L11
version = "2.7.5"
version = "3.8.3"
align.openParenCallSite = false
continuationIndent.defnSite = 2
rewrite.rules = [SortImports, RedundantBraces]
Expand Down
2 changes: 1 addition & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import sbt._

object Common {
val settings: Seq[Def.Setting[_]] = Seq(
scalaVersion := "2.12.19",
scalaVersion := "2.12.20",
organization := "weco",
resolvers ++= Seq(
"Wellcome releases" at "s3://releases.mvn-repo.wellcomecollection.org/"
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ object ExternalDependencies {
lazy val versions = new {
val circeOptics = "0.14.1"
val scalatest = "3.2.19"
val scalatestplus = "3.1.4.0"
val scalatestplus = "3.2.2.0"
val scalacheckShapeless = "1.1.8"
val scalacsv = "1.3.10"
val scalacsv = "1.4.1"

// This should match the version used in scala-libs
// See https://github.com/wellcomecollection/scala-libs/blob/main/project/Dependencies.scala
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.9.9
sbt.version=1.10.2

2 changes: 1 addition & 1 deletion project/build.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.35")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16")
addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.22.0")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.23.0")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.2")
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
addDependencyTreePlugin