Skip to content

Commit

Permalink
Merge branch 'master' into update/scala-library-2.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
tkrs authored Mar 25, 2024
2 parents 488f361 + 76ffdcb commit f14b99c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.17
version = 3.8.0
maxColumn = 120
assumeStandardLibraryStripMargin = true

Expand Down
12 changes: 6 additions & 6 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ object Dependencies {

val organizeImports = "0.5.0"

val msgpackJava = "0.9.7"
val msgpackJava = "0.9.8"
val mess = "0.3.5"
val scalaLogging = "3.9.5"
val logback = "1.2.3"

val scalatest = "3.2.17"
val scalatest = "3.2.18"
val scalatestplus = new {
val scalacheck = "3.2.14.0"
val mockito = "3.2.10.0"
val scalacheck = "3.2.18.0"
val mockito = "3.2.18.0"
}
}

Expand All @@ -34,8 +34,8 @@ object Dependencies {
lazy val logbackClassic = "ch.qos.logback" % "logback-classic" % Ver.logback

lazy val scalatest = "org.scalatest" %% "scalatest" % Ver.scalatest
lazy val scalacheck = "org.scalatestplus" %% "scalacheck-1-16" % Ver.scalatestplus.scalacheck
lazy val mockito = "org.scalatestplus" %% "mockito-3-4" % Ver.scalatestplus.mockito
lazy val scalacheck = "org.scalatestplus" %% "scalacheck-1-17" % Ver.scalatestplus.scalacheck
lazy val mockito = "org.scalatestplus" %% "mockito-5-10" % Ver.scalatestplus.mockito

lazy val forTest = Seq(scalatest, scalacheck, mockito)
}
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
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")

0 comments on commit f14b99c

Please sign in to comment.