diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 022b20c..c700956 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,6 @@ f2b19baca828a4d88b46bc009aef6d7115e63924 # Scala Steward: Reformat with scalafmt 3.9.5 ecfbaf459af23ed5981aa3b030425f67dece7f9e + +# Scala Steward: Reformat with scalafmt 3.9.7 +cb2021ce0648edfbf4bb45f2962562820c7b677b diff --git a/.scalafmt.conf b/.scalafmt.conf index a6d8f1c..0a5780f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version="3.9.5" +version="3.9.7" maxColumn = 120 runner.dialect = scala3 diff --git a/build.sbt b/build.sbt index bc2c4f0..733e479 100644 --- a/build.sbt +++ b/build.sbt @@ -31,7 +31,7 @@ assembly / assemblyJarName := "LibreCaptcha.jar" ThisBuild / assemblyMergeStrategy := { case PathList("module-info.class") => MergeStrategy.discard case x if x.endsWith("/module-info.class") => MergeStrategy.discard - case x => + case x => val oldStrategy = (ThisBuild / assemblyMergeStrategy).value oldStrategy(x) } diff --git a/src/main/scala/lc/core/captchaManager.scala b/src/main/scala/lc/core/captchaManager.scala index 95a951c..b41483f 100644 --- a/src/main/scala/lc/core/captchaManager.scala +++ b/src/main/scala/lc/core/captchaManager.scala @@ -160,7 +160,7 @@ class CaptchaManager(config: Config, captchaProviders: CaptchaProviders) { def checkAnswer(answer: Answer): Either[Error, Success] = { val challenge = getSecret(answer.id) challenge match { - case None => Right(Success(ResultEnum.EXPIRED.toString)) + case None => Right(Success(ResultEnum.EXPIRED.toString)) case Some(value) => { val (provider, secret) = value val check = captchaProviders.getProviderById(provider).checkAnswer(secret, answer.answer)