From a3fbfa83ea8a4d8c9d3187275c90e03c0b26acaa Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 11 Nov 2022 14:07:31 -0500 Subject: [PATCH] scala-parser-combinators 1.x for 2.12 --- project/dependencies.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/project/dependencies.scala b/project/dependencies.scala index 9163cecf..2002bad5 100644 --- a/project/dependencies.scala +++ b/project/dependencies.scala @@ -20,7 +20,8 @@ object Dependencies { val launcherInterface = "org.scala-sbt" % "launcher-interface" % "0.12.0" val scalaXml1 = "org.scala-lang.modules" %% "scala-xml" % "1.3.0" val scalaXml2 = "org.scala-lang.modules" %% "scala-xml" % "2.1.0" - val scalaParser = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1" + val scalaParserCombinators1 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2" + val scalaParserCombinators2 = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1" val cxfVersion = "3.3.1" val cxfFrontendJaxws = "org.apache.cxf" % "cxf-rt-frontend-jaxws" % cxfVersion val cxfFrontendJaxrs = "org.apache.cxf" % "cxf-rt-frontend-jaxrs" % cxfVersion @@ -47,8 +48,9 @@ object Dependencies { log4j ) ++ (sv match { case x if sv.startsWith("2.10.") => Nil - case x if sv.startsWith("2.11.") => Seq(scalaXml1, scalaParser) - case x if sv.startsWith("2.12.") || sv.startsWith("2.13.") => Seq(scalaXml2, scalaParser) + case x if sv.startsWith("2.11.") => Seq(scalaXml1, scalaParserCombinators1) + case x if sv.startsWith("2.12.") => Seq(scalaXml2, scalaParserCombinators1) + case x if sv.startsWith("2.13.") => Seq(scalaXml2, scalaParserCombinators2) }) def integrationDependencies(sv: String) = Seq( dispatch(sv) % "test",