From 57ddff8a5904313111f09a7e9bc94768a4e990b8 Mon Sep 17 00:00:00 2001 From: sh0hei Date: Thu, 16 Sep 2021 22:05:33 +0900 Subject: [PATCH] Update scalafmt-core to 3.0.0 --- .scalafmt.conf | 5 +++-- build.sbt | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e3e7eb70e..ec6f3d3af 100644 --- 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 index 181ac32f4..bcbd0ec40 100644 --- 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 )