From e7e143adfba5a5684f89e17164b935de5e90d547 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 01/19] Update sbt-bloop to 1.6.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index cfc37a23..23f66b54 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.34") addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.19.0") addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.3.2") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0") addDependencyTreePlugin From 83b465034e3550631b2e0d7f6bcad50838ccbff5 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 02/19] Update logback-access to 1.4.14 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a698750a..2f32ff46 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,7 +13,7 @@ object Dependencies { val circeGenericExtras = "0.14.3" val typesafe = "1.4.2" - val logback = "1.4.7" + val logback = "1.4.14" val mockito = "1.10.19" val scalatest = "3.2.3" val scalatestPlus = "3.1.2.0" From 093ad2c3981a374df8febd1ea62561bdd646278e Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 03/19] Update apm-agent-api to 1.51.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2f32ff46..ad35349b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,7 +2,7 @@ import sbt._ object Dependencies { lazy val versions = new { - val elasticApm = "1.22.0" + val elasticApm = "1.51.0" val elastic4s = "8.9.1" val aws = "2.25.28" From 04e0ec85b19202c3c5095f97b9a02807cc6f3079 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 04/19] Update fm-sbt-s3-resolver to 0.22.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 23f66b54..b1c44999 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.34") -addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.19.0") +addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.22.0") addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0") addDependencyTreePlugin From e2702aab5b479026fc7366fe0810b9f543f06d64 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 05/19] Update sbt-scalafmt to 1.16 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b1c44999..0b777921 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.34") addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.22.0") -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16") addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0") addDependencyTreePlugin From 85b7dbc766d796e1b2251e72eed23c297804a1e5 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 06/19] Update elastic4s-client-esjava to 8.9.5 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ad35349b..9b4ac826 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,7 +3,7 @@ import sbt._ object Dependencies { lazy val versions = new { val elasticApm = "1.51.0" - val elastic4s = "8.9.1" + val elastic4s = "8.9.5" val aws = "2.25.28" From 25eb3e525640c5aa196d7a9e160e704165e55475 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 07/19] Update sbt-docker-compose to 1.0.35 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0b777921..f9ed2070 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.34") +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") From bb0c1c3f1b16497b18aa66b2f4f3334c7bdc71d5 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 08/19] Update typesafe:config to 1.4.3 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9b4ac826..6e4f335d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { val circe = "0.14.5" val circeGenericExtras = "0.14.3" - val typesafe = "1.4.2" + val typesafe = "1.4.3" val logback = "1.4.14" val mockito = "1.10.19" val scalatest = "3.2.3" From 773774752faabce64af9f87f283a3f4af3816b1c Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 09/19] Update commons-io to 2.16.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6e4f335d..70fab07d 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.0.4" - val apacheCommons = "2.6" + val apacheCommons = "2.16.1" // Provides slf4j-api val grizzled = "1.3.4" From e235e47d0bed2ec6b26623d47f2b54e20be73079 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 10/19] Update circe-core to 0.14.9 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 70fab07d..d0845aaa 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.5" + val circe = "0.14.9" val circeGenericExtras = "0.14.3" val typesafe = "1.4.3" From 742f22de0e5418deb288a96462e5b20420db6099 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 11/19] Update circe-generic-extras to 0.14.4 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d0845aaa..ce2630d8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,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 circeGenericExtras = "0.14.3" + val circeGenericExtras = "0.14.4" val typesafe = "1.4.3" val logback = "1.4.14" From 8ae5b8cd6e0e75cd35e2f836ba673f837a5c50c2 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 12/19] Update jna to 5.14.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ce2630d8..1b6336b7 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.7.0" + "net.java.dev.jna" % "jna" % "5.14.0" ) val localstackDependencies = Seq( From 7620127e720d185e0319a10b1bfceda6076e06d1 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 13/19] Update pekko-actor-testkit-typed to 1.1.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1b6336b7..025e5f2b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -24,7 +24,7 @@ object Dependencies { // Provides slf4j-api val grizzled = "1.3.4" - val pekko = "1.0.3" + val pekko = "1.1.0" val pekkoConnectors = "1.0.2" val pekkoHttp = "1.0.1" val pekkoHttpJson = "2.6.0" From b057649ef4807df8cb0a9f178ada2858d4690d00 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 14/19] Update mockito-core to 5.13.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 025e5f2b..12d36d5b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { val typesafe = "1.4.3" val logback = "1.4.14" - val mockito = "1.10.19" + val mockito = "5.13.0" val scalatest = "3.2.3" val scalatestPlus = "3.1.2.0" val scalatestPlusMockitoArtifactId = "mockito-3-2" From 84030ef7b270454dcfc29b7913830e73ce2c83a4 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:34 +0000 Subject: [PATCH 15/19] Update scala-library to 2.12.19 --- 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 f2964247..f4b0ade7 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -6,7 +6,7 @@ import sbt._ object Common { def createSettings(projectVersion: String): Seq[Def.Setting[_]] = Seq( - scalaVersion := "2.12.15", + scalaVersion := "2.12.19", organization := "weco", scalacOptions ++= Seq( "-deprecation", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 12d36d5b..5a1cff78 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.15" + val scalaReflectVersion = "2.12.19" } val circeDependencies = Seq( From cc6b3a4dd791f166251ebca88165279e11b33b48 Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:35 +0000 Subject: [PATCH 16/19] Update sbt to 1.9.9 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index abbbce5d..04267b14 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 From 363d6028afde068ca86930088eee922c0a07fd3a Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:35 +0000 Subject: [PATCH 17/19] Update scalatest to 3.2.19 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5a1cff78..197dd431 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { val typesafe = "1.4.3" val logback = "1.4.14" val mockito = "5.13.0" - val scalatest = "3.2.3" + val scalatest = "3.2.19" val scalatestPlus = "3.1.2.0" val scalatestPlusMockitoArtifactId = "mockito-3-2" val scanamo = "1.0.4" From 76c9b1f27dc195976e118df9e65468ef69d10d4f Mon Sep 17 00:00:00 2001 From: "wellcome-collection-scala-steward[bot]" <163891433+wellcome-collection-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:03:35 +0000 Subject: [PATCH 18/19] Update scanamo to 1.1.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 197dd431..e450aa28 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.0.4" + val scanamo = "1.1.1" val apacheCommons = "2.16.1" // Provides slf4j-api From 4b74f02fe48511b03ede3a4643b346a84e12c820 Mon Sep 17 00:00:00 2001 From: Github on behalf of Wellcome Collection Date: Wed, 4 Sep 2024 11:05:00 +0000 Subject: [PATCH 19/19] Apply auto-formatting rules --- .../scala/weco/storage/store/HybridStoreWithMaxima.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/storage/src/main/scala/weco/storage/store/HybridStoreWithMaxima.scala b/storage/src/main/scala/weco/storage/store/HybridStoreWithMaxima.scala index 5d463973..5c03fa57 100644 --- a/storage/src/main/scala/weco/storage/store/HybridStoreWithMaxima.scala +++ b/storage/src/main/scala/weco/storage/store/HybridStoreWithMaxima.scala @@ -14,10 +14,8 @@ trait HybridStoreWithMaxima[Id, V, TypedStoreId, T] extends HybridStore[Version[Id, V], TypedStoreId, T] with Maxima[Id, Version[Id, V], T] { - override implicit val indexedStore: Store[Version[Id, V], TypedStoreId] with Maxima[ - Id, - Version[Id, V], - TypedStoreId] + override implicit val indexedStore: Store[Version[Id, V], TypedStoreId] + with Maxima[Id, Version[Id, V], TypedStoreId] override def max(id: Id): MaxEither = indexedStore