Skip to content

Commit

Permalink
Merge branch 'main' into update/sbt-ci-release-1.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
johanandren authored Oct 30, 2024
2 parents 9e31f42 + 3416baa commit b9e80ee
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ object Dependencies {
"com.typesafe.slick" %% "slick" % SlickVersion,
"org.slf4j" % "slf4j-api" % "2.0.16",
"com.typesafe.slick" %% "slick-hikaricp" % SlickVersion,
"ch.qos.logback" % "logback-classic" % "1.5.8" % Test,
"ch.qos.logback" % "logback-classic" % "1.5.12" % Test,
"com.typesafe.akka" %% "akka-slf4j" % AkkaVersion % Test,
"com.typesafe.akka" %% "akka-persistence-tck" % AkkaVersion % Test,
"com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % Test,
Expand All @@ -33,7 +33,7 @@ object Dependencies {

val Migration: Seq[ModuleID] = Seq(
"com.typesafe" % "config" % "1.4.3",
"ch.qos.logback" % "logback-classic" % "1.5.8",
"ch.qos.logback" % "logback-classic" % "1.5.12",
"org.testcontainers" % "postgresql" % "1.20.1" % Test,
"org.scalatest" %% "scalatest" % ScalaTestVersion % Test) ++ JdbcDrivers.map(_ % Provided)
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright 2016 Dennis Vriend
# Copyright (C) 2019 - 2022 Lightbend Inc. <https://www.lightbend.com>
#
sbt.version=1.10.2
sbt.version=1.10.4
3 changes: 2 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ addDependencyTreePlugin

// release
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")

// docs
addSbtPlugin("io.akka" % "sbt-paradox-akka" % "24.10.3")
addSbtPlugin("com.github.sbt" % "sbt-site" % "1.7.0")
Expand Down

0 comments on commit b9e80ee

Please sign in to comment.