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.

Sign up for GitHub

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

Jump to bottom

chore: update dependencies #2264

Merged
merged 8 commits into from Oct 24, 2022
Merged

chore: update dependencies #2264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b0b3cb
update jedis to 4.3.1
BalduinLandolt Oct 24, 2022
82485bc
update spring security core 5.7.4
BalduinLandolt Oct 24, 2022
57b640d
update scalafmt
BalduinLandolt Oct 24, 2022
b5707f8
update kamon to 2.5.9
BalduinLandolt Oct 24, 2022
e66550c
update icu4j
BalduinLandolt Oct 24, 2022
af56c40
update sbt-assembly plugin
BalduinLandolt Oct 24, 2022
6f923ef
update logback
BalduinLandolt Oct 24, 2022
2dfb7c1
Merge branch 'main' into wip/update-dependencies-221024
BalduinLandolt Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
@@ -1,4 +1,4 @@
version = "3.5.9"
version = "3.6.0"
runner.dialect = scala213
maxColumn = 120
align.preset = most
Expand Down
12 changes: 6 additions & 6 deletions project/Dependencies.scala
View file
Open in desktop
Expand Up @@ -58,12 +58,12 @@ object Dependencies {
// logging
val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5" // Scala 3 compatible
val slf4jApi = "org.slf4j" % "slf4j-api" % "2.0.3" // the logging interface
val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.4.3" // the logging implementation
val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.4.4" // the logging implementation

// Metrics
val aspectjweaver = "org.aspectj" % "aspectjweaver" % "1.9.9.1"
val kamonCore = "io.kamon" %% "kamon-core" % "2.5.8" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.5.8" // Scala 3 incompatible
val kamonCore = "io.kamon" %% "kamon-core" % "2.5.9" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.5.9" // Scala 3 incompatible

// input validation
val commonsValidator =
Expand All @@ -73,20 +73,20 @@ object Dependencies {
val jwtSprayJson = "com.github.jwt-scala" %% "jwt-spray-json" % "9.0.2"
// jwtSprayJson -> 9.0.2 is the latest version that's compatible with spray-json; if it wasn't for spray, this would be Scala 3 compatible
val springSecurityCore =
"org.springframework.security" % "spring-security-core" % "5.7.3" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
"org.springframework.security" % "spring-security-core" % "5.7.4" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.72"

// caching
val ehcache = "net.sf.ehcache" % "ehcache" % "2.10.9.2"
val jedis = "redis.clients" % "jedis" % "4.3.0"
val jedis = "redis.clients" % "jedis" % "4.3.1"

// serialization
val chill = "com.twitter" %% "chill" % "0.10.0" // Scala 3 incompatible

// other
val diff = "com.sksamuel.diff" % "diff" % "1.1.11"
val gwtServlet = "com.google.gwt" % "gwt-servlet" % "2.10.0"
val icu4j = "com.ibm.icu" % "icu4j" % "71.1"
val icu4j = "com.ibm.icu" % "icu4j" % "72.1"
val jakartaJSON = "org.glassfish" % "jakarta.json" % "2.0.1"
val jodd = "org.jodd" % "jodd" % "3.2.7"
val rdf4jClient = "org.eclipse.rdf4j" % "rdf4j-client" % "4.2.0"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.9")
addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.0.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.6")
addSbtPlugin("io.gatling" % "gatling-sbt" % "2.2.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
Expand Down