diff options
| author | Juan J. Martinez <jjm@usebox.net> | 2023-08-08 12:05:28 +0100 |
|---|---|---|
| committer | Juan J. Martinez <jjm@usebox.net> | 2023-08-08 12:05:28 +0100 |
| commit | a42d3883f110831440f2d85977e9251c4a22541a (patch) | |
| tree | 740b333cdccda5c468dfda1abbcc6f1e332f992b | |
| parent | 39d552f1478977242b4cc09c834ccae9c3281299 (diff) | |
| download | spacebeans-a42d3883f110831440f2d85977e9251c4a22541a.tar.gz spacebeans-a42d3883f110831440f2d85977e9251c4a22541a.zip | |
Updated dependencies and scalafmt
| -rw-r--r-- | .scalafmt.conf | 15 | ||||
| -rw-r--r-- | build.sc | 8 |
2 files changed, 18 insertions, 5 deletions
diff --git a/.scalafmt.conf b/.scalafmt.conf index dd18323..efea3b4 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1 +1,14 @@ -version = 2.5.2 +version = 3.7.12 +runner.dialect = scala213 + +align.preset = some +maxColumn = 120 +newlines.beforeCurlyLambdaParams = multilineWithCaseOnly + +rewrite.rules = [Imports] +rewrite.imports.sort = original +rewrite.imports.groups = [ + ["java\\..*", "javax\\..*"], + ["scala\\..*"], + ["net\\.usebox\\..*"] +] @@ -8,7 +8,7 @@ import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION` import mill.contrib.buildinfo.BuildInfo object server extends ScalaModule with ScalafmtModule with BuildInfo { - def scalaVersion = "2.13.10" + def scalaVersion = "2.13.11" def scalacOptions = Seq( @@ -25,11 +25,11 @@ object server extends ScalaModule with ScalafmtModule with BuildInfo { def ivyDeps = Agg( - ivy"ch.qos.logback:logback-classic:1.4.7", + ivy"ch.qos.logback:logback-classic:1.4.9", ivy"com.github.pureconfig::pureconfig:0.17.4", ivy"com.github.scopt::scopt:4.1.0", - ivy"com.typesafe.akka::akka-stream:2.6.20", - ivy"org.bouncycastle:bcprov-jdk15to18:1.73", + ivy"com.typesafe.akka::akka-stream:2.8.3", + ivy"org.bouncycastle:bcprov-jdk15to18:1.76", ivy"org.log4s::log4s:1.10.0" ) |