Skip to content

Commit

Permalink
Merge pull request #586 from scala-steward/update/scalafmt-core-3.7.0
Browse files Browse the repository at this point in the history
scalafmt-core 3.7.0 (was 3.6.1)
  • Loading branch information
mkurz authored Jan 23, 2023
2 parents adde5d9 + fe608d6 commit 020c2fd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Scala Steward: Reformat with scalafmt 3.6.0
c846f08f0eba509d8f0f39114578cbe61465106d

# Scala Steward: Reformat with scalafmt 3.7.0
3c4978dc8f174746eea3ce8c1588907c737baffc
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.6.1
version = 3.7.0

runner.dialect = scala213

Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ lazy val compiler = project
}
},
libraryDependencies += parserCombinators(scalaVersion.value) % Optional,
libraryDependencies += ("org.scalameta" %% "parsers" % "4.7.1").cross(CrossVersion.for3Use2_13),
run / fork := true
libraryDependencies += ("org.scalameta" %% "parsers" % "4.7.1").cross(CrossVersion.for3Use2_13),
run / fork := true
)
.aggregate(parser)
.dependsOn(apiJvm % Test, parser % "compile->compile;test->test")
Expand Down
2 changes: 1 addition & 1 deletion docs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ lazy val docs = project
)
},
headerMappings ++= Map(
FileType("sbt") -> HeaderCommentStyle.cppStyleLineComment,
FileType("sbt") -> HeaderCommentStyle.cppStyleLineComment,
FileType("properties") -> HeaderCommentStyle.hashLineComment,
FileType("md") -> CommentStyle(new LineCommentCreator("<!---", "-->"), commentBetween("<!---", "*", "-->")),
),
Expand Down

0 comments on commit 020c2fd

Please sign in to comment.