Merge pull request #217 from mkurz/deps

Update all dependencies + scalafmt

Author: mkurz

.gitignore

@@ -1,2 +1,3 @@
 target
 .idea
+.bsp/

.scalafmt.conf

@@ -1,18 +1,19 @@
-version = 3.8.3
+version = 3.9.4
 
 style = defaultWithAlign
 
-docstrings                 = JavaDoc
-indentOperator             = spray
+runner.dialect             = scala212
+docstrings.style           = Asterisk
+indentOperator.preset      = spray
 maxColumn                  = 120
 rewrite.rules              = [RedundantParens, SortImports, AvoidInfix]
-unindentTopLevelOperators  = true
+indentOperator.topLevelOnly = false
 align.tokens               = [{code = "=>", owner = "Case"}]
 align.openParenDefnSite    = false
 align.openParenCallSite    = false
 optIn.breakChainOnFirstMethodDot = false
 optIn.configStyleArguments = false
-danglingParentheses = false
+danglingParentheses.preset = false
 spaces.inImportCurlyBraces = true
 rewrite.neverInfix.excludeFilters = [
   and
@@ -49,4 +50,4 @@ rewriteTokens = {
   "⇒": "=>"
   "→": "->"
   "←": "<-"
-}
+}

build.sbt

@@ -9,8 +9,10 @@ lazy val plugin = project
     organizationHomepage := Some(url("https://lightbend.com")),
     name := "sbt-java-formatter",
     homepage := scmInfo.value.map(_.browseUrl),
-    scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-java-formatter"), "scm:git:[email protected]:sbt/sbt-java-formatter.git")),
-    developers := List(Developer("ktoso", "Konrad 'ktoso' Malawski", "<[email protected]>", url("https://github.com/ktoso"))),
+    scmInfo := Some(
+      ScmInfo(url("https://github.com/sbt/sbt-java-formatter"), "scm:git:[email protected]:sbt/sbt-java-formatter.git")),
+    developers := List(
+      Developer("ktoso", "Konrad 'ktoso' Malawski", "<[email protected]>", url("https://github.com/ktoso"))),
     libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.7"),
     startYear := Some(2015),
     description := "Formats Java code in your project.",
@@ -24,6 +26,5 @@ lazy val plugin = project
       Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
     },
     scriptedBufferLog := false,
-    scalafmtOnCompile := true,
-  )
+    scalafmtOnCompile := true)
   .enablePlugins(AutomateHeaderPlugin)

plugin/src/main/scala/com/lightbend/sbt/javaformatter/JavaFormatter.scala

@@ -67,7 +67,7 @@ object JavaFormatter {
 
     implicit val analysisIso = LList.iso(
       { a: Analysis => ("failedCheck", a.failedCheck) :*: LNil },
-      { in: (Set[File] :*: LNil) =>
+      { in: Set[File] :*: LNil =>
         Analysis(in.head)
       })
   }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.3
+sbt.version=1.10.11

project/plugins.sbt

@@ -1,7 +1,7 @@
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3")
 
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value