Skip to content

Commit a933ee7

Browse files
authored
Merge pull request #445 from scala-steward/update/1.2.x/patches
[1.2.x] Patch updates
2 parents 39b465b + bae6ae8 commit a933ee7

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# Scala Steward: Reformat with scalafmt 3.9.7
22
4627e868a4e618a23a873433f6d404151ea2bebe
3+
4+
# Scala Steward: Reformat with scalafmt 3.10.6
5+
71b1523bd66ab1c6c3acc8cbc1de32cb6a82cc9f

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi
99
rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ]
1010
spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy }
1111
trailingCommas = preserve
12-
version = 3.10.5
12+
version = 3.10.6

src/main/scala/play/dev/filewatch/FileWatchService.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ object FileWatchService {
8484
new FileWatchService {
8585
lazy val delegate = os match {
8686
// If Windows or Linux, use JDK7 Watch Service (assume JDK7+)
87-
case (Windows | Linux) => jdk7(logger, disableFileHashCheck)
87+
case Windows | Linux => jdk7(logger, disableFileHashCheck)
8888
// If mac OS, use the mac implementation
8989
case Mac =>
9090
try mac(logger, disableFileHashCheck)

0 commit comments

Comments
 (0)