From d126336dd576811cb945a1f2d31f078a7c512bed Mon Sep 17 00:00:00 2001 From: eikek-scala-steward Date: Thu, 22 Sep 2022 06:46:34 +0000 Subject: [PATCH 1/2] Update scala-library to 2.13.9 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d5f5dd0e..6e2d5209 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ val scalafixSettings = Seq( val sharedSettings = Seq( organization := "com.github.eikek", - scalaVersion := "2.13.8", + scalaVersion := "2.13.9", organizationName := "Eike K. & Contributors", licenses += ("AGPL-3.0-or-later", url( "https://spdx.org/licenses/AGPL-3.0-or-later.html" From c84645dd468c20c9eafbd1f258010081a61948f3 Mon Sep 17 00:00:00 2001 From: eikek Date: Sat, 24 Sep 2022 12:49:15 +0200 Subject: [PATCH 2/2] Fix compile error new in scala 2.13.9 --- .../src/main/scala/docspell/query/internal/StringUtil.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/query/shared/src/main/scala/docspell/query/internal/StringUtil.scala b/modules/query/shared/src/main/scala/docspell/query/internal/StringUtil.scala index 3488c721..7a012c0d 100644 --- a/modules/query/shared/src/main/scala/docspell/query/internal/StringUtil.scala +++ b/modules/query/shared/src/main/scala/docspell/query/internal/StringUtil.scala @@ -76,7 +76,7 @@ object StringUtil { /** String content without the delimiter */ def undelimitedString(endP: P[Unit]): P[String] = escapedToken.backtrack - .orElse((!endP).with1 ~ P.anyChar) + .orElse(((!endP).with1 ~ P.anyChar).void) .rep .string .flatMap { str =>