diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..7c5f950 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.6.1 +eaafed401980749eb08523a28366c73d36ef4437 diff --git a/.scalafmt.conf b/.scalafmt.conf index a47e59b..0b66998 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.6.0" +version = "3.6.1" preset = "defaultWithAlign" runner.dialect = "scala213" diff --git a/src/sbt-test/sbt-header/no-file-extensions/test.sbt b/src/sbt-test/sbt-header/no-file-extensions/test.sbt index f68b6df..93906d8 100644 --- a/src/sbt-test/sbt-header/no-file-extensions/test.sbt +++ b/src/sbt-test/sbt-header/no-file-extensions/test.sbt @@ -1,16 +1,27 @@ headerLicense := Some(HeaderLicense.ALv2("2015", "Heiko Seeberger")) // Files named exactly "routes" (with no extension) -headerMappings := headerMappings.value + (HeaderFileType("", None, "routes") -> HeaderCommentStyle.hashLineComment) +headerMappings := headerMappings.value + (HeaderFileType( + "", + None, + "routes" +) -> HeaderCommentStyle.hashLineComment) // Files named exactly "more.routes" -headerMappings := headerMappings.value + (HeaderFileType("routes", None, "more") -> HeaderCommentStyle.cStyleBlockComment) +headerMappings := headerMappings.value + (HeaderFileType( + "routes", + None, + "more" +) -> HeaderCommentStyle.cStyleBlockComment) // Hidden files named exactly ".routes" -headerMappings := headerMappings.value + (HeaderFileType("", None, ".routes") -> HeaderCommentStyle.cppStyleLineComment) +headerMappings := headerMappings.value + (HeaderFileType( + "", + None, + ".routes" +) -> HeaderCommentStyle.cppStyleLineComment) // Do not exclude hidden files (.filename) unmanagedResources / excludeFilter := (_ => false) - val checkFileContents = taskKey[Unit]("Verify file contents match expected contents") checkFileContents := { diff --git a/src/sbt-test/sbt-header/simple/test.sbt b/src/sbt-test/sbt-header/simple/test.sbt index d15bcd6..27b7043 100644 --- a/src/sbt-test/sbt-header/simple/test.sbt +++ b/src/sbt-test/sbt-header/simple/test.sbt @@ -3,7 +3,9 @@ headerLicense := Some(HeaderLicense.ALv2("2015", "Heiko Seeberger")) // A file named exactly "routes" will NOT be taken into account even if the header extension is "routes" // A hidden file .routes must be treated with file name ".routes" and without extension // A hidden file .some.routes must be treated with extension "*.routes" -headerMappings := headerMappings.value + (HeaderFileType("routes") -> HeaderCommentStyle.cppStyleLineComment) +headerMappings := headerMappings.value + (HeaderFileType( + "routes" +) -> HeaderCommentStyle.cppStyleLineComment) // Do not exclude hidden files (.filename) unmanagedResources / excludeFilter := (_ => false) @@ -12,9 +14,15 @@ val checkFileContents = taskKey[Unit]("Verify file contents match expected conte checkFileContents := { checkFile("HasHeader.scala", scalaSource.in(Compile).value) checkFile("HasNoHeader.scala", scalaSource.in(Compile).value) - checkFile("routes", resourceDirectory.in(Compile).value) - checkFile(".routes", resourceDirectory.in(Compile).value) // does not have extension, file name is only ".routes" - checkFile(".some.routes", resourceDirectory.in(Compile).value) // hidden file with extension .routes + checkFile("routes", resourceDirectory.in(Compile).value) + checkFile( + ".routes", + resourceDirectory.in(Compile).value + ) // does not have extension, file name is only ".routes" + checkFile( + ".some.routes", + resourceDirectory.in(Compile).value + ) // hidden file with extension .routes def checkFile(name: String, sourceDir: sbt.File) = { val actualPath = (sourceDir / name).toString