Update dependencies & default scalastyle config; reformat code. (#49)

beautiful-scala · Jul 28, 2020 · ce41c75 · ce41c75
1 parent 4e5e623
commit ce41c75
Show file tree

Hide file tree

Showing 4 changed files with 345 additions and 155 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,3 @@
-
 version = "2.6.4"
 align = some
 align {
@@ -17,10 +16,9 @@ align {
 assumeStandardLibraryStripMargin = true
 continuationIndent.defnSite = 2
 continuationIndent.callSite = 2
-danglingParentheses = true
 docstrings = JavaDoc
-indentOperator = spray
 maxColumn = 110
+newlines.implicitParamListModifierPrefer = before
 project {
   git = true
   excludeFilters = ["target"]

diff --git a/build.sbt b/build.sbt
@@ -29,7 +29,7 @@ developers := List(
   )
 )
 
-scalaVersion := "2.12.11"
+scalaVersion := "2.12.12"
 scalacOptions := Seq(
   "-encoding",
   "UTF-8",
@@ -46,7 +46,7 @@ scalacOptions := Seq(
 )
 cancelable in Global := true
 
-libraryDependencies += "com.beautiful-scala" %% "scalastyle" % "1.4.0"
+libraryDependencies += "com.beautiful-scala" %% "scalastyle" % "1.5.0"
 
 // build info
 buildInfoKeys := Seq[BuildInfoKey](organization, name, version, scalaVersion, sbtVersion)