Skip to content

Commit

Permalink
Merge pull request #707 from jcazevedo/rollback-parser-combinators
Browse files Browse the repository at this point in the history
Rollback scala-parser-combinators to 1.1.2 on Scala 2.x
  • Loading branch information
tminglei authored Mar 20, 2024
2 parents 920b899 + cdb07b0 commit f06a275
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ lazy val commonSettings = Seq(
)

def mainDependencies(scalaVersion: String) = {
val isScala3 = scalaVersion.startsWith("3")

Seq (
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0",
"org.scala-lang.modules" %% "scala-parser-combinators" % (if (isScala3) "2.3.0" else "1.1.2"),
"dev.zio" %% "izumi-reflect" % "2.3.8",
"com.typesafe.slick" %% "slick" % "3.5.0",
"org.postgresql" % "postgresql" % "42.7.3",
Expand All @@ -73,7 +75,7 @@ def mainDependencies(scalaVersion: String) = {
"org.scalatest" %% "scalatest" % "3.2.18" % "test",
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.41.3" % "test",
"com.dimafeng" %% "testcontainers-scala-postgresql" % "0.41.3" % "test"
) ++ (if (scalaVersion.startsWith("3")) Nil else Seq("org.scala-lang" % "scala-reflect" % scalaVersion))
) ++ (if (isScala3) Nil else Seq("org.scala-lang" % "scala-reflect" % scalaVersion))
}

lazy val slickPgCore = (project in file("./core"))
Expand Down

0 comments on commit f06a275

Please sign in to comment.