Skip to content

Commit d960edc

Browse files
committed
chore(dep): use scala-xml 2.x for everything
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.
1 parent 67daad6 commit d960edc

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

build.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class CoreJvm(val crossScalaVersion: String) extends CoreJvmBase {
185185
)
186186
def ivyDeps = super.ivyDeps() ++ Agg(
187187
Deps.concurrentReferenceHashMap,
188-
Deps.scalaXml(scalaVersion())
188+
Deps.scalaXml
189189
)
190190
object test extends Tests with CsTests {
191191
def ivyDeps = super.ivyDeps() ++ Agg(

project/deps.sc

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,15 @@ object Deps {
4646
def scalaNativeTools040M2 = ivy"org.scala-native::tools:0.4.0-M2"
4747
def scalaNativeTools040 = ivy"org.scala-native::tools:0.4.7"
4848
def scalaReflect(sv: String) = ivy"org.scala-lang:scala-reflect:$sv"
49-
def scalaXml(sv: String) = {
50-
val ver =
51-
if (sv.startsWith("2.12.")) "1.3.0"
52-
else "2.1.0"
53-
ivy"org.scala-lang.modules::scala-xml:$ver"
54-
}
55-
def scalazCore = ivy"org.scalaz::scalaz-core::${Versions.scalaz}"
56-
def scalazConcurrent = ivy"org.scalaz::scalaz-concurrent:${Versions.scalaz}"
57-
def simulacrum = ivy"org.typelevel::simulacrum:1.0.0"
58-
def slf4JNop = ivy"org.slf4j:slf4j-nop:2.0.1"
59-
def svm = ivy"org.graalvm.nativeimage:svm:22.0.0.2"
60-
def ujson = ivy"com.lihaoyi::ujson:1.4.2"
61-
def utest = ivy"com.lihaoyi::utest::0.8.1"
62-
def windowsAnsi = ivy"io.github.alexarchambault.windows-ansi:windows-ansi:0.0.4"
49+
def scalaXml = ivy"org.scala-lang.modules::scala-xml:2.1.0"
50+
def scalazCore = ivy"org.scalaz::scalaz-core::${Versions.scalaz}"
51+
def scalazConcurrent = ivy"org.scalaz::scalaz-concurrent:${Versions.scalaz}"
52+
def simulacrum = ivy"org.typelevel::simulacrum:1.0.0"
53+
def slf4JNop = ivy"org.slf4j:slf4j-nop:2.0.1"
54+
def svm = ivy"org.graalvm.nativeimage:svm:22.0.0.2"
55+
def ujson = ivy"com.lihaoyi::ujson:1.4.2"
56+
def utest = ivy"com.lihaoyi::utest::0.8.1"
57+
def windowsAnsi = ivy"io.github.alexarchambault.windows-ansi:windows-ansi:0.0.4"
6358
}
6459

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

8378
object ScalaVersions {
8479
def scala213 = "2.13.6"
85-
def scala212 = "2.12.16"
80+
def scala212 = "2.12.17"
8681
val all = Seq(scala213, scala212)
8782

8883
def scalaJs = "1.9.0"

0 commit comments

Comments
 (0)