Skip to content

Commit

Permalink
chore(dep): use scala-xml 2.x for everything
Browse files Browse the repository at this point in the history
This is a continuation or really a revert of what was done in coursier#2274.
Originally this was done because Scala 2.12 was on 1.x, but that is no
longer the case. You can see the discussion for this in
scala/bug#12632. I'm assuming that other
things like sbt that will use this will also hit on it as well if it's
still on 1.x. See sbt/sbt#6997 for more
details on that. This also then bumps Scala 2.12 to 2.12.17 to make sure
the scala-xml is aligned there too.
  • Loading branch information
ckipp01 committed Oct 14, 2022
1 parent 67daad6 commit d960edc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class CoreJvm(val crossScalaVersion: String) extends CoreJvmBase {
)
def ivyDeps = super.ivyDeps() ++ Agg(
Deps.concurrentReferenceHashMap,
Deps.scalaXml(scalaVersion())
Deps.scalaXml
)
object test extends Tests with CsTests {
def ivyDeps = super.ivyDeps() ++ Agg(
Expand Down
25 changes: 10 additions & 15 deletions project/deps.sc
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,15 @@ object Deps {
def scalaNativeTools040M2 = ivy"org.scala-native::tools:0.4.0-M2"
def scalaNativeTools040 = ivy"org.scala-native::tools:0.4.7"
def scalaReflect(sv: String) = ivy"org.scala-lang:scala-reflect:$sv"
def scalaXml(sv: String) = {
val ver =
if (sv.startsWith("2.12.")) "1.3.0"
else "2.1.0"
ivy"org.scala-lang.modules::scala-xml:$ver"
}
def scalazCore = ivy"org.scalaz::scalaz-core::${Versions.scalaz}"
def scalazConcurrent = ivy"org.scalaz::scalaz-concurrent:${Versions.scalaz}"
def simulacrum = ivy"org.typelevel::simulacrum:1.0.0"
def slf4JNop = ivy"org.slf4j:slf4j-nop:2.0.1"
def svm = ivy"org.graalvm.nativeimage:svm:22.0.0.2"
def ujson = ivy"com.lihaoyi::ujson:1.4.2"
def utest = ivy"com.lihaoyi::utest::0.8.1"
def windowsAnsi = ivy"io.github.alexarchambault.windows-ansi:windows-ansi:0.0.4"
def scalaXml = ivy"org.scala-lang.modules::scala-xml:2.1.0"
def scalazCore = ivy"org.scalaz::scalaz-core::${Versions.scalaz}"
def scalazConcurrent = ivy"org.scalaz::scalaz-concurrent:${Versions.scalaz}"
def simulacrum = ivy"org.typelevel::simulacrum:1.0.0"
def slf4JNop = ivy"org.slf4j:slf4j-nop:2.0.1"
def svm = ivy"org.graalvm.nativeimage:svm:22.0.0.2"
def ujson = ivy"com.lihaoyi::ujson:1.4.2"
def utest = ivy"com.lihaoyi::utest::0.8.1"
def windowsAnsi = ivy"io.github.alexarchambault.windows-ansi:windows-ansi:0.0.4"
}

object Versions {
Expand All @@ -82,7 +77,7 @@ def jvmIndex = "https://github.com/coursier/jvm-index/raw/master/index.json"

object ScalaVersions {
def scala213 = "2.13.6"
def scala212 = "2.12.16"
def scala212 = "2.12.17"
val all = Seq(scala213, scala212)

def scalaJs = "1.9.0"
Expand Down

0 comments on commit d960edc

Please sign in to comment.