From 83db6139107efa144a97addd434ebef11c154208 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:21 +0000 Subject: [PATCH 01/14] Update sbt-bloop to 2.0.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7f89befc..7cd37b9b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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.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") addDependencyTreePlugin From c3c449a1eca5880dd48a3e2ca97b38e5317909a9 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:21 +0000 Subject: [PATCH 02/14] Update logback-access to 1.5.8 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8c5e8537..c9ae015a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,7 +13,7 @@ object Dependencies { val circeGenericExtras = "0.14.4" val typesafe = "1.4.3" - val logback = "1.4.14" + val logback = "1.5.8" val mockito = "5.13.0" val scalatest = "3.2.19" val scalatestPlus = "3.1.2.0" From 583f62329b9edf8e555961c0252d2cdbe40c8eb3 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:21 +0000 Subject: [PATCH 03/14] Update apm-agent-api to 1.52.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c9ae015a..b91487b8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,7 +2,7 @@ import sbt._ object Dependencies { lazy val versions = new { - val elasticApm = "1.51.0" + val elasticApm = "1.52.0" val elastic4s = "8.9.5" val aws = "2.25.70" From 795b14bde3106884518b2dbd297fd9a758542739 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:21 +0000 Subject: [PATCH 04/14] Update fm-sbt-s3-resolver to 0.23.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7cd37b9b..a452012a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ 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" % "2.0.2") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") From 906631c4d650b1933ffd2857a026448e684edd29 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:21 +0000 Subject: [PATCH 05/14] Update pekko-http-circe to 2.8.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b91487b8..b7bc1e62 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -27,7 +27,7 @@ object Dependencies { 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 From df6ff884acb2afcbdf25289707f07d5c3ad9f404 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:21 +0000 Subject: [PATCH 06/14] Update elastic4s-client-esjava to 8.11.5 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b7bc1e62..b8f8a5e2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,7 +3,7 @@ import sbt._ object Dependencies { lazy val versions = new { val elasticApm = "1.52.0" - val elastic4s = "8.9.5" + val elastic4s = "8.11.5" val aws = "2.25.70" From 05381b00be42f8e5fb3feff5b5fcedb84a6f975e Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:21 +0000 Subject: [PATCH 07/14] Update commons-io to 2.17.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b8f8a5e2..11f866b0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -19,7 +19,7 @@ object Dependencies { val scalatestPlus = "3.1.2.0" val scalatestPlusMockitoArtifactId = "mockito-3-2" val scanamo = "1.1.1" - val apacheCommons = "2.16.1" + val apacheCommons = "2.17.0" // Provides slf4j-api val grizzled = "1.3.4" From acc3f2e80f02e4c032ddf11bca52b150c987ac7e Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:21 +0000 Subject: [PATCH 08/14] Update circe-core to 0.14.10 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 11f866b0..805f34f8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,7 +9,7 @@ object Dependencies { // 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" From e2f1eaa1742a55feec4bce1d99b59bed6c290760 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:22 +0000 Subject: [PATCH 09/14] Update jna to 5.15.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 805f34f8..3d0216c9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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( From 51df90ce622eb0483b43cb4c86cf2f4e8b57f123 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:22 +0000 Subject: [PATCH 10/14] Update mockito-core to 5.14.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3d0216c9..c630bd97 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { val typesafe = "1.4.3" val logback = "1.5.8" - val mockito = "5.13.0" + val mockito = "5.14.1" val scalatest = "3.2.19" val scalatestPlus = "3.1.2.0" val scalatestPlusMockitoArtifactId = "mockito-3-2" From 0a0871577603dfdc9c516e59f1330a652a2633d7 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:22 +0000 Subject: [PATCH 11/14] Update scala-library to 2.12.20 --- project/Common.scala | 2 +- project/Dependencies.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Common.scala b/project/Common.scala index 69da7cdb..a102d2cc 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -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( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c630bd97..591e2180 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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( From 7094c45fb525bf677b44effa4103ddb270d70344 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:22 +0000 Subject: [PATCH 12/14] Update sbt to 1.10.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 04267b14..0b699c30 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.2 From 7bdf9634da7116b6935b19c1dc0afea6f5bbfae2 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:22 +0000 Subject: [PATCH 13/14] Update scanamo to 2.0.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 591e2180..3b4f9f97 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -18,7 +18,7 @@ object Dependencies { val scalatest = "3.2.19" val scalatestPlus = "3.1.2.0" val scalatestPlusMockitoArtifactId = "mockito-3-2" - val scanamo = "1.1.1" + val scanamo = "2.0.0" val apacheCommons = "2.17.0" // Provides slf4j-api From adc8e1a36fb7ccef30bf3fdcd1c5ba778b403c98 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:59:22 +0000 Subject: [PATCH 14/14] Update sbt-sonatype to 3.11.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index a452012a..f1a4971d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,5 +3,5 @@ addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.23.0") addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16") 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