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

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e7e143a
Update sbt-bloop to 1.6.0
wellcome-collection-scala-steward[bot] Sep 4, 2024
83b4650
Update logback-access to 1.4.14
wellcome-collection-scala-steward[bot] Sep 4, 2024
093ad2c
Update apm-agent-api to 1.51.0
wellcome-collection-scala-steward[bot] Sep 4, 2024
04e0ec8
Update fm-sbt-s3-resolver to 0.22.0
wellcome-collection-scala-steward[bot] Sep 4, 2024
e2702aa
Update sbt-scalafmt to 1.16
wellcome-collection-scala-steward[bot] Sep 4, 2024
85b7dbc
Update elastic4s-client-esjava to 8.9.5
wellcome-collection-scala-steward[bot] Sep 4, 2024
25eb3e5
Update sbt-docker-compose to 1.0.35
wellcome-collection-scala-steward[bot] Sep 4, 2024
bb0c1c3
Update typesafe:config to 1.4.3
wellcome-collection-scala-steward[bot] Sep 4, 2024
7737747
Update commons-io to 2.16.1
wellcome-collection-scala-steward[bot] Sep 4, 2024
e235e47
Update circe-core to 0.14.9
wellcome-collection-scala-steward[bot] Sep 4, 2024
742f22d
Update circe-generic-extras to 0.14.4
wellcome-collection-scala-steward[bot] Sep 4, 2024
8ae5b8c
Update jna to 5.14.0
wellcome-collection-scala-steward[bot] Sep 4, 2024
7620127
Update pekko-actor-testkit-typed to 1.1.0
wellcome-collection-scala-steward[bot] Sep 4, 2024
b057649
Update mockito-core to 5.13.0
wellcome-collection-scala-steward[bot] Sep 4, 2024
84030ef
Update scala-library to 2.12.19
wellcome-collection-scala-steward[bot] Sep 4, 2024
cc6b3a4
Update sbt to 1.9.9
wellcome-collection-scala-steward[bot] Sep 4, 2024
363d602
Update scalatest to 3.2.19
wellcome-collection-scala-steward[bot] Sep 4, 2024
76c9b1f
Update scanamo to 1.1.1
wellcome-collection-scala-steward[bot] Sep 4, 2024
4b74f02
Apply auto-formatting rules
weco-bot Sep 4, 2024
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 @@ -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",
Expand Down
26 changes: 13 additions & 13 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@ import sbt._

object Dependencies {
lazy val versions = new {
val elasticApm = "1.22.0"
val elastic4s = "8.9.1"
val elasticApm = "1.51.0"
val elastic4s = "8.9.5"

val aws = "2.25.28"

// 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 circeGenericExtras = "0.14.3"
val circe = "0.14.9"
val circeGenericExtras = "0.14.4"

val typesafe = "1.4.2"
val logback = "1.4.7"
val mockito = "1.10.19"
val scalatest = "3.2.3"
val typesafe = "1.4.3"
val logback = "1.4.14"
val mockito = "5.13.0"
val scalatest = "3.2.19"
val scalatestPlus = "3.1.2.0"
val scalatestPlusMockitoArtifactId = "mockito-3-2"
val scanamo = "1.0.4"
val apacheCommons = "2.6"
val scanamo = "1.1.1"
val apacheCommons = "2.16.1"

// 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"
Expand All @@ -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(
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.7.0"
"net.java.dev.jna" % "jna" % "5.14.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.8
sbt.version=1.9.9
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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("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")
addDependencyTreePlugin
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down