Skip to content

Commit

Permalink
Merge pull request #119 from scala-steward/update/scalafmt-core-3.3.1
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.3.1
  • Loading branch information
hrj authored Jan 2, 2022
2 parents 992b07c + ff9462e commit fe07663
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version="3.3.0"
version="3.3.1"
maxColumn = 120
runner.dialect = scala213source3
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Compile / run / mainClass := Some("lc.LCFramework")
assembly / assemblyJarName := "LibreCaptcha.jar"

ThisBuild / assemblyMergeStrategy := {
case PathList("module-info.class") => MergeStrategy.discard
case PathList("module-info.class") => MergeStrategy.discard
case x if x.endsWith("/module-info.class") => MergeStrategy.discard
case x =>
val oldStrategy = (ThisBuild / assemblyMergeStrategy).value
Expand Down

0 comments on commit fe07663

Please sign in to comment.