Skip to content

Commit

Permalink
Avoid duplicate dependencies in build
Browse files Browse the repository at this point in the history
scalafmt-core has now shaded pprint so doesn't depend anymore on pprint
from com.lihaoyi
  • Loading branch information
lolgab committed Sep 1, 2023
1 parent eba07f8 commit 0c976d7
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -217,18 +217,14 @@ lazy val `quill-util` =
libraryDependencies ++= Seq(
("org.scalameta" %% "scalafmt-core" % "3.1.2")
.excludeAll(
(Seq(
ExclusionRule(organization = "com.lihaoyi", name = "sourcecode_2.13"),
ExclusionRule(organization = "com.lihaoyi", name = "fansi_2.13"),
ExclusionRule(organization = "com.lihaoyi", name = "pprint_2.13")
) ++ {
(
if (isScala3)
Seq(
ExclusionRule(organization = "org.scala-lang.modules")
)
else
Seq()
}): _*
): _*
)
.cross(CrossVersion.for3Use2_13)
)
Expand Down Expand Up @@ -278,16 +274,14 @@ lazy val `quill-engine` =
"com.typesafe" % "config" % "1.4.2",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
("com.github.takayahilton" %%% "sql-formatter" % "1.2.1").cross(CrossVersion.for3Use2_13),
"io.suzaku" %% "boopickle" % "1.4.0"
"io.suzaku" %%% "boopickle" % "1.4.0"
),
coverageExcludedPackages := "<empty>;.*AstPrinter;.*Using;io.getquill.Model;io.getquill.ScalarTag;io.getquill.QuotationTag"
)
.jsSettings(
libraryDependencies ++= Seq(
"com.lihaoyi" %%% "pprint" % "0.8.1",
"io.github.cquiroz" %%% "scala-java-time" % "2.5.0",
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.2.0",
"io.suzaku" %%% "boopickle" % "1.4.0"
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.2.0"
),
coverageExcludedPackages := ".*"
)
Expand All @@ -313,9 +307,6 @@ lazy val `quill-core` =
Test / fork := true
)
.jsSettings(
libraryDependencies ++= Seq(
"com.lihaoyi" %%% "pprint" % "0.8.1"
),
unmanagedSources / excludeFilter := new SimpleFileFilter(file => file.getName == "DynamicQuerySpec.scala"),
coverageExcludedPackages := ".*"
)
Expand Down Expand Up @@ -772,7 +763,7 @@ lazy val basicSettings = excludeFilterSettings ++ Seq(
scalaVersion := scala_v_13,
crossScalaVersions := Seq(scala_v_12, scala_v_13, scala_v_30),
libraryDependencies ++= Seq(
"com.lihaoyi" %% "pprint" % "0.8.1",
"com.lihaoyi" %%% "pprint" % "0.8.1",
"org.scalatest" %%% "scalatest" % "3.2.16" % Test,
"com.google.code.findbugs" % "jsr305" % "3.0.2" % Provided // just to avoid warnings during compilation
) ++ {
Expand Down

0 comments on commit 0c976d7

Please sign in to comment.