Skip to content

Commit

Permalink
Merge pull request #84 from scala-steward/update/scalafmt-core-3.8.4
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.8.4
  • Loading branch information
tgodzik authored Jan 14, 2025
2 parents aa0ae33 + 5a62558 commit 94d7310
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.4
348bda65bcba11b0c01fbce938b76d00c2e2fb29
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.3"
version = "3.8.4"

align.preset = more
maxColumn = 100
Expand Down
5 changes: 2 additions & 3 deletions publish/src/coursier/publish/dir/Dir.scala
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ object Dir {
}
}

Files.isDirectory(dir) && {
validate(dir).getOrElse(false)
}
Files.isDirectory(dir) &&
validate(dir).getOrElse(false)
}

def read(dir: Path, logger: => DirLogger): FileSet = {
Expand Down
9 changes: 4 additions & 5 deletions publish/src/coursier/publish/sbt/Sbt.scala
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,10 @@ object Sbt {
def isSbtProject(dir: Path): Boolean =
Files.isDirectory(dir) && {
val buildProps = dir.resolve("project/build.properties")
Files.isRegularFile(buildProps) && {
Try(new String(Files.readAllBytes(buildProps), StandardCharsets.UTF_8))
.toOption
.exists(_.linesIterator.exists(_.startsWith("sbt.version=")))
}
Files.isRegularFile(buildProps) &&
Try(new String(Files.readAllBytes(buildProps), StandardCharsets.UTF_8))
.toOption
.exists(_.linesIterator.exists(_.startsWith("sbt.version=")))
}

}

0 comments on commit 94d7310

Please sign in to comment.