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 #254

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import xerial.sbt.Sonatype.autoImport.{sonatypeCredentialHost, sonatypePublishTo

object Common {
def createSettings(projectVersion: String): Seq[Def.Setting[_]] = Seq(
scalaVersion := "2.12.19",
scalaVersion := "2.12.20",
organization := "org.wellcomecollection",
homepage := Some(url("https://github.com/wellcomecollection/scala-libs")),
scmInfo := Some(
Expand Down
20 changes: 10 additions & 10 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@ import sbt._

object Dependencies {
lazy val versions = new {
val elasticApm = "1.51.0"
val elastic4s = "8.9.5"
val elasticApm = "1.52.0"
val elastic4s = "8.11.5"

val aws = "2.25.70"

// Note: this should probably match the version of Circe used by elastic4s.
// See https://github.com/sksamuel/elastic4s/blob/master/project/Dependencies.scala
val circe = "0.14.9"
val circe = "0.14.10"
val circeGenericExtras = "0.14.4"

val typesafe = "1.4.3"
val logback = "1.4.14"
val mockito = "5.13.0"
val logback = "1.5.8"
val mockito = "5.14.1"
val scalatest = "3.2.19"
val scalatestPlus = "3.1.2.0"
val scalatestPlusMockitoArtifactId = "mockito-3-2"
val scanamo = "1.1.1"
val apacheCommons = "2.16.1"
val scanamo = "2.0.0"
val apacheCommons = "2.17.0"

// Provides slf4j-api
val grizzled = "1.3.4"

val pekko = "1.1.1"
val pekkoConnectors = "1.0.2"
val pekkoHttp = "1.1.0"
val pekkoHttpJson = "2.6.0"
val pekkoHttpJson = "2.8.0"

// This needs to be set explicitly to match the language version
// used by the version of shapeless that Circe uses, otherwise SBT
Expand All @@ -36,7 +36,7 @@ object Dependencies {
//
// java.lang.NoClassDefFoundError: scala/reflect/internal/Names$Name
//
val scalaReflectVersion = "2.12.19"
val scalaReflectVersion = "2.12.20"
}

val circeDependencies = Seq(
Expand Down Expand Up @@ -121,7 +121,7 @@ object Dependencies {
// See https://github.com/elastic/apm-agent-java/issues/2353 for an explanation
// of the issue this addresses.
val jnaDependencies: Seq[ModuleID] = Seq(
"net.java.dev.jna" % "jna" % "5.14.0"
"net.java.dev.jna" % "jna" % "5.15.0"
)

val localstackDependencies = 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.9
sbt.version=1.10.2
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.35")
addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.22.0")
addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.23.0")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.2")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.3")
addDependencyTreePlugin
Loading