Skip to content

Commit

Permalink
Merge pull request #593 from eed3si9n/wip/parser-combinators
Browse files Browse the repository at this point in the history
scala-parser-combinators 1.x for 2.12
  • Loading branch information
eed3si9n authored Nov 11, 2022
2 parents 3a08761 + a3fbfa8 commit 1cc2ce9
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions project/dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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",
Expand Down

0 comments on commit 1cc2ce9

Please sign in to comment.