From 3122206ff7b55d35c846fab0432e9d73fa486fb8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 2 Jan 2022 05:26:36 +0100 Subject: [PATCH 1/2] Update scalafmt-core to 3.3.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 3b1a243..9567408 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version="3.3.0" +version="3.3.1" maxColumn = 120 runner.dialect = scala213source3 From ff9462e9bc15800d3405b083aef2b0d3cc8f551c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 2 Jan 2022 05:26:42 +0100 Subject: [PATCH 2/2] Reformat with scalafmt 3.3.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0245cb7..a0313f0 100644 --- a/build.sbt +++ b/build.sbt @@ -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