diff --git a/build.sbt b/build.sbt index 9ab80888c..ebd85f79e 100644 --- a/build.sbt +++ b/build.sbt @@ -99,7 +99,7 @@ lazy val `lm-coursier-shaded` = project "io.get-coursier" %% "coursier" % coursierVersion0, "io.github.alexarchambault" %% "data-class" % "0.2.5" % Provided, "org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1", - "org.scala-lang.modules" %% "scala-xml" % "2.1.0", // depending on that one so that it doesn't get shaded + "org.scala-lang.modules" %% "scala-xml" % "1.3.0", // depending on that one so that it doesn't get shaded "org.scala-sbt" %% "librarymanagement-ivy" % { if (scalaBinaryVersion.value == "2.12") lmVersion else lm2_13Version diff --git a/project/Settings.scala b/project/Settings.scala index 7c183ad1a..ad7d8632f 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -36,6 +36,13 @@ object Settings { scalacOptions ++= { if (isAtLeastScala213.value) Seq("-Ymacro-annotations") else Nil + }, + libraryDependencySchemes ++= { + val sv = scalaVersion.value + if (sv.startsWith("2.13.")) + Seq("org.scala-lang.modules" %% "scala-xml" % "always") + else + Nil } ) ++ { val prop = sys.props.getOrElse("publish.javadoc", "").toLowerCase(Locale.ROOT) diff --git a/project/build.properties b/project/build.properties index dbae93bcf..bb3a9b7dc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.5.6