Merge pull request #1015 from sh0hei/update/scalafmt-core-3.0.0

Update scalafmt-core to 3.0.3
fthomas · Sep 16, 2021 · d5bb868 · d5bb868
2 parents 7ca2c00 + 57ddff8
commit d5bb868
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,6 +1,7 @@
-version = 2.7.5
+version = 3.0.3
+
 maxColumn = 100
-docstrings = JavaDoc
+docstrings.style = keep
 rewrite.rules = [PreferCurlyFors, RedundantBraces]
 rewriteTokens {
   "⇒": "=>"

diff --git a/build.sbt b/build.sbt
@@ -457,7 +457,7 @@ lazy val compileSettings = Def.settings(
             case Some((2, 13)) => Seq(file(dir.getPath + "-3.0-"))
             case Some((0, _))  => Seq(file(dir.getPath + "-3.0+"))
             case Some((3, 0))  => Seq(file(dir.getPath + "-3.0+"))
-            case other         => sys.error(s"unmanagedSourceDirectories for scalaVersion $other not set")
+            case other => sys.error(s"unmanagedSourceDirectories for scalaVersion $other not set")
           }
       }
     }
@@ -476,7 +476,7 @@ lazy val scaladocSettings = Def.settings(
       //"-diagrams",
       "-diagrams-debug",
       "-doc-source-url",
-      s"${scmInfo.value.get.browseUrl}/blob/${tree}€{FILE_PATH}.scala",
+      s"${scmInfo.value.get.browseUrl}/blob/$tree€{FILE_PATH}.scala",
       "-sourcepath",
       (LocalRootProject / baseDirectory).value.getAbsolutePath
     )