Skip to content

Commit

Permalink
Merge pull request #655 from ihostage/fix-deps
Browse files Browse the repository at this point in the history
`scala-parser-combinators` shouldn't be optional dependency
  • Loading branch information
mkurz authored Aug 28, 2023
2 parents a395916 + 4314b9f commit 86170a6
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ lazy val parser = project
scalaVersion := Scala212,
crossScalaVersions := ScalaVersions,
mimaSettings,
name := "twirl-parser",
libraryDependencies += parserCombinators(scalaVersion.value) % Optional,
libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test,
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % Test,
name := "twirl-parser",
libraryDependencies += parserCombinators(scalaVersion.value),
libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test,
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % Test,
)

lazy val compiler = project
Expand All @@ -124,11 +124,11 @@ lazy val compiler = project
case _ => Seq("org.scala-lang" %% "scala3-compiler" % scalaVersion.value % Test)
}
},
libraryDependencies += parserCombinators(scalaVersion.value) % Optional,
libraryDependencies += ("org.scalameta" %% "parsers" % "4.8.8").cross(CrossVersion.for3Use2_13),
run / fork := true,
buildInfoKeys := Seq[BuildInfoKey](scalaVersion),
buildInfoPackage := "play.twirl.compiler"
libraryDependencies += parserCombinators(scalaVersion.value),
libraryDependencies += ("org.scalameta" %% "parsers" % "4.8.8").cross(CrossVersion.for3Use2_13),
run / fork := true,
buildInfoKeys := Seq[BuildInfoKey](scalaVersion),
buildInfoPackage := "play.twirl.compiler"
)
.aggregate(parser)
.dependsOn(apiJvm % Test, parser % "compile->compile;test->test")
Expand Down

0 comments on commit 86170a6

Please sign in to comment.