mirror of https://github.com/sbt/sbt.git
Downgrade scala-xml to 2.13
This commit is contained in:
parent
bd4f7b7b73
commit
28febfb9c8
|
|
@ -459,7 +459,7 @@ lazy val testingProj = (project in file("testing"))
|
|||
baseSettings,
|
||||
name := "Testing",
|
||||
libraryDependencies ++= Seq(
|
||||
scalaXml.value,
|
||||
scalaXml.value.cross(CrossVersion.for3Use2_13),
|
||||
testInterface,
|
||||
launcherInterface,
|
||||
sjsonNewScalaJson.value,
|
||||
|
|
@ -923,7 +923,7 @@ lazy val mainProj = (project in file("main"))
|
|||
},
|
||||
libraryDependencies ++=
|
||||
(Seq(
|
||||
scalaXml.value,
|
||||
scalaXml.value.cross(CrossVersion.for3Use2_13),
|
||||
sjsonNewScalaJson.value,
|
||||
sjsonNewCore.value,
|
||||
launcherInterface,
|
||||
|
|
@ -1040,7 +1040,7 @@ lazy val sbtClientProj = (project in file("client"))
|
|||
crossPaths := false,
|
||||
exportJars := true,
|
||||
libraryDependencies += jansi,
|
||||
libraryDependencies += scalatest % Test,
|
||||
libraryDependencies += (scalatest % Test).cross(CrossVersion.for3Use2_13),
|
||||
Compile / mainClass := Some("sbt.client.Client"),
|
||||
nativeImageReady := { () =>
|
||||
()
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ object Dependencies {
|
|||
// sbt modules
|
||||
private val ioVersion = nightlyVersion.getOrElse("1.8.0")
|
||||
private val lmVersion =
|
||||
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("2.0.0-alpha7")
|
||||
val zincVersion = nightlyVersion.getOrElse("2.0.0-alpha6")
|
||||
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("2.0.0-alpha8")
|
||||
val zincVersion = nightlyVersion.getOrElse("2.0.0-alpha7")
|
||||
|
||||
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
|
||||
|
||||
|
|
@ -80,7 +80,7 @@ object Dependencies {
|
|||
def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore)
|
||||
|
||||
// val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.10"
|
||||
val lmCoursierShaded = "org.scala-sbt" %% "librarymanagement-coursier" % "2.0.0-alpha2"
|
||||
val lmCoursierShaded = "org.scala-sbt" %% "librarymanagement-coursier" % "2.0.0-alpha3"
|
||||
|
||||
lazy val sjsonNewVersion = "0.13.0"
|
||||
def sjsonNew(n: String) = Def.setting(
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ object NightlyPlugin extends AutoPlugin {
|
|||
Seq(
|
||||
scalacheck % Test,
|
||||
junit % Test,
|
||||
scalatest % Test,
|
||||
(scalatest % Test).cross(CrossVersion.for3Use2_13),
|
||||
scalaVerify % Test,
|
||||
hedgehog % Test
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue