Merge pull request #285 from scala-steward/update/scalafmt-core-3.9.7

Update scalafmt-core to 3.9.7
This commit is contained in:
hrj 2025-06-01 09:22:16 +05:30 committed by GitHub
commit 07e54b5bd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 3 deletions

View File

@ -6,3 +6,6 @@ f2b19baca828a4d88b46bc009aef6d7115e63924
# Scala Steward: Reformat with scalafmt 3.9.5
ecfbaf459af23ed5981aa3b030425f67dece7f9e
# Scala Steward: Reformat with scalafmt 3.9.7
cb2021ce0648edfbf4bb45f2962562820c7b677b

View File

@ -1,3 +1,3 @@
version="3.9.5"
version="3.9.7"
maxColumn = 120
runner.dialect = scala3

View File

@ -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)
}

View File

@ -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)