From 28febfb9c8d4879b099bc61b61cc886cb5f1727e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 8 Dec 2022 00:31:12 -0500 Subject: [PATCH] Downgrade scala-xml to 2.13 --- build.sbt | 6 +++--- project/Dependencies.scala | 6 +++--- project/NightlyPlugin.scala | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index d23046faf..c229de207 100644 --- a/build.sbt +++ b/build.sbt @@ -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 := { () => () diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 355a70f7c..483bd6729 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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( diff --git a/project/NightlyPlugin.scala b/project/NightlyPlugin.scala index 38979f0f9..c27576d2b 100644 --- a/project/NightlyPlugin.scala +++ b/project/NightlyPlugin.scala @@ -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 )