Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into disqualify-by-taken…
Browse files Browse the repository at this point in the history
…-date

# Conflicts:
#	.scalafmt.conf
  • Loading branch information
intracer committed Jul 6, 2024
2 parents 9d0e130 + 7b2bc4a commit 5f2c882
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = 3.8.0
version = 3.8.1
runner.dialect = scala213
maxColumn = 100
24 changes: 12 additions & 12 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import sbt._

object Dependencies {

val AaltoXmlV = "1.3.2"
val AaltoXmlV = "1.3.3"
val BetterFilesV = "3.9.2"
val BlameApiV = "15.10.7"
val BlameApiV = "15.10.11"
val ChronicleMapV = "3.22.9"
val ChronoScalaV = "1.0.0"
val FicusV = "1.5.2"
Expand All @@ -13,17 +13,17 @@ object Dependencies {
val JimFsV = "1.3.0"
val JodaTimeV = "2.12.2"
val JSoupV = "1.17.2"
val LogbackClassicV = "1.5.3"
val LogbackClassicV = "1.5.6"
val MockServerV = "5.15.0"
val ReactiveStreamsV = "1.0.4"
val RetryV = "0.3.6"
val Scala213V = "2.13.13"
val Scala213V = "2.13.14"
val ScalaChartV = "0.8.0"
val ScalaCheckV = "1.17.0"
val ScalaCheckV = "1.18.0"
val ScalaCsvV = "1.3.10"
val ScalaParserCombinatorsV = "2.2.0"
val ScalaXmlV = "2.1.0"
val ScallopV = "5.0.1"
val ScallopV = "5.1.0"
val Slf4jV = "2.0.5"
val SwcEngineV = "3.1.9"
val TypesafeConfigV = "1.4.3"
Expand Down Expand Up @@ -92,8 +92,8 @@ object Dependencies {
}

object Poi {
val PoiV = "5.2.5"
val PoiXwpfV = "2.0.4"
val PoiV = "5.3.0"
val PoiXwpfV = "2.0.6"

val scratchpad = "org.apache.poi" % "poi-scratchpad" % PoiV
val poi = "org.apache.poi" % "poi" % PoiV
Expand All @@ -105,10 +105,10 @@ object Dependencies {
}

object Commons {
val CommonsCodecV = "1.16.1"
val CommonsCompressV = "1.26.1"
val CommonsCodecV = "1.17.0"
val CommonsCompressV = "1.26.2"
val CommonsLang3V = "3.7"
val CommonsIoV = "2.15.1"
val CommonsIoV = "2.16.1"

val codec = "commons-codec" % "commons-codec" % CommonsCodecV
val io = "commons-io" % "commons-io" % CommonsIoV
Expand All @@ -128,7 +128,7 @@ object Dependencies {
}

object Specs2 {
val SpecsV = "4.20.5"
val SpecsV = "4.20.8"

val core = "org.specs2" %% "specs2-core" % SpecsV
val matcherExtra = "org.specs2" %% "specs2-matcher-extra" % SpecsV
Expand Down

0 comments on commit 5f2c882

Please sign in to comment.