From cdb07b0f20ecb289f683862fc72d5b6f10e4f3fc Mon Sep 17 00:00:00 2001 From: Joao Azevedo Date: Fri, 15 Mar 2024 16:43:50 +0000 Subject: [PATCH] Rollback scala-parser-combinators to 1.1.2 on Scala 2.x --- build.sbt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index fa5d0768..a76907fc 100644 --- a/build.sbt +++ b/build.sbt @@ -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.2", @@ -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"))