luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use scala-xml_3 instead

This commit is contained in:
Eugene Yokota 2022-12-08 18:40:34 -05:00
parent 28febfb9c8
commit d2c2563d8a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sbt
View File

@ -459,7 +459,7 @@ lazy val testingProj = (project in file("testing"))
baseSettings, baseSettings,
name := "Testing", name := "Testing",
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
scalaXml.value.cross(CrossVersion.for3Use2_13), scalaXml.value,
testInterface, testInterface,
launcherInterface, launcherInterface,
sjsonNewScalaJson.value, sjsonNewScalaJson.value,
@ -923,7 +923,7 @@ lazy val mainProj = (project in file("main"))
}, },
libraryDependencies ++= libraryDependencies ++=
(Seq( (Seq(
scalaXml.value.cross(CrossVersion.for3Use2_13), scalaXml.value,
sjsonNewScalaJson.value, sjsonNewScalaJson.value,
sjsonNewCore.value, sjsonNewCore.value,
launcherInterface, launcherInterface,
@ -1040,7 +1040,7 @@ lazy val sbtClientProj = (project in file("client"))
crossPaths := false, crossPaths := false,
exportJars := true, exportJars := true,
libraryDependencies += jansi, libraryDependencies += jansi,
libraryDependencies += (scalatest % Test).cross(CrossVersion.for3Use2_13), libraryDependencies += scalatest % Test,
Compile / mainClass := Some("sbt.client.Client"), Compile / mainClass := Some("sbt.client.Client"),
nativeImageReady := { () => nativeImageReady := { () =>
() ()

6
project/Dependencies.scala
View File

@ -15,8 +15,8 @@ object Dependencies {
// sbt modules // sbt modules
private val ioVersion = nightlyVersion.getOrElse("1.8.0") private val ioVersion = nightlyVersion.getOrElse("1.8.0")
private val lmVersion = private val lmVersion =
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("2.0.0-alpha8") sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("2.0.0-alpha7")
val zincVersion = nightlyVersion.getOrElse("2.0.0-alpha7") val zincVersion = nightlyVersion.getOrElse("2.0.0-alpha6")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
@ -80,7 +80,7 @@ object Dependencies {
def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore)
// val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.10" // val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.10"
val lmCoursierShaded = "org.scala-sbt" %% "librarymanagement-coursier" % "2.0.0-alpha3" val lmCoursierShaded = "org.scala-sbt" %% "librarymanagement-coursier" % "2.0.0-alpha4"
lazy val sjsonNewVersion = "0.13.0" lazy val sjsonNewVersion = "0.13.0"
def sjsonNew(n: String) = Def.setting( def sjsonNew(n: String) = Def.setting(

2
project/NightlyPlugin.scala
View File

@ -14,7 +14,7 @@ object NightlyPlugin extends AutoPlugin {
Seq( Seq(
scalacheck % Test, scalacheck % Test,
junit % Test, junit % Test,
(scalatest % Test).cross(CrossVersion.for3Use2_13), scalatest % Test,
scalaVerify % Test, scalaVerify % Test,
hedgehog % Test hedgehog % Test
) )