cleanup dependency settings

This commit is contained in:
xuwei-k 2024-10-23 08:25:51 +09:00
parent ec70bae39a
commit ab988030fc
2 changed files with 10 additions and 28 deletions

View File

@ -321,7 +321,7 @@ lazy val utilPosition = (project in file("internal") / "util-position")
utilCommonSettings,
name := "Util Position",
scalacOptions += "-language:experimental.macros",
libraryDependencies ++= Seq(scalaReflect.value, scalatest % "test"),
libraryDependencies ++= Seq(scalaReflect, scalatest % "test"),
utilMimaSettings,
)
@ -424,7 +424,7 @@ lazy val utilCache = project
sjsonNewCore.value,
sjsonNewScalaJson.value,
sjsonNewMurmurhash.value,
scalaReflect.value
scalaReflect
),
Compile / managedSourceDirectories +=
baseDirectory.value / "src" / "main" / "contraband-scala",
@ -458,7 +458,7 @@ lazy val utilScripted = (project in file("internal") / "util-scripted")
.settings(
utilCommonSettings,
name := "Util Scripted",
libraryDependencies += scalaParsers.value,
libraryDependencies += scalaParsers,
utilMimaSettings,
)
.configure(addSbtIO)
@ -472,7 +472,7 @@ lazy val testingProj = (project in file("testing"))
baseSettings,
name := "Testing",
libraryDependencies ++= Seq(
scalaXml.value,
scalaXml,
testInterface,
launcherInterface,
sjsonNewScalaJson.value,
@ -913,7 +913,7 @@ lazy val mainProj = (project in file("main"))
},
libraryDependencies ++=
(Seq(
scalaXml.value,
scalaXml,
sjsonNewScalaJson.value,
sjsonNewCore.value,
launcherInterface,
@ -1358,11 +1358,11 @@ lazy val lmCore = (project in file("lm-core"))
contrabandSjsonNewVersion := sjsonNewVersion,
libraryDependencies ++= Seq(
jsch,
// scalaReflect.value,
// scalaReflect,
// scalaCompiler.value,
launcherInterface,
gigahorseApacheHttp,
scalaXml.value,
scalaXml,
sjsonNewScalaJson.value % Optional,
sjsonNewCore.value % Optional,
scalaTest % Test,

View File

@ -100,27 +100,9 @@ object Dependencies {
val scalaCompiler = "org.scala-lang" %% "scala3-compiler" % scala3
val scala3Library = "org.scala-lang" %% "scala3-library" % scala3
val scalaXml = Def.setting(
if (scalaBinaryVersion.value == "3") {
"org.scala-lang.modules" %% "scala-xml" % "2.2.0"
} else {
"org.scala-lang.modules" %% "scala-xml" % "2.2.0"
}
)
val scalaParsers = Def.setting(
if (scalaBinaryVersion.value == "3") {
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.0"
} else {
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
}
)
val scalaReflect = Def.setting(
if (scalaBinaryVersion.value == "3") {
"org.scala-lang" % "scala-reflect" % scala213
} else {
"org.scala-lang" % "scala-reflect" % scalaVersion.value
}
)
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.2.0"
val scalaParsers = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.0"
val scalaReflect = "org.scala-lang" % "scala-reflect" % scala213
val scalaPar = "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4"
val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0"