Skip to content

Commit dc6bd51

Browse files
authored
fix: stick to scala-xml 1.x for 2.12 to align with the compiler. (#411)
scala/scala#9743
1 parent d014d3f commit dc6bd51

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

build.sbt

+13-18
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ lazy val sharedSettings = List(
8282
} else {
8383
scalacOptions.value
8484
}
85-
}
85+
},
86+
libraryDependencies += "org.scalameta" %% "munit" % munitVersion % Test
8687
)
8788

8889
lazy val root = Project("scalac-scoverage", file("."))
@@ -103,9 +104,6 @@ lazy val runtime = CrossProject(
103104
name := "scalac-scoverage-runtime",
104105
crossScalaVersions := Seq(defaultScala212, defaultScala213),
105106
crossTarget := target.value / s"scala-${scalaVersion.value}",
106-
libraryDependencies ++= Seq(
107-
"org.scalameta" %% "munit" % munitVersion % Test
108-
),
109107
sharedSettings
110108
)
111109
.jvmSettings(
@@ -126,10 +124,7 @@ lazy val plugin =
126124
crossTarget := target.value / s"scala-${scalaVersion.value}",
127125
crossScalaVersions := bin212 ++ bin213,
128126
crossVersion := CrossVersion.full,
129-
libraryDependencies ++= Seq(
130-
"org.scalameta" %% "munit" % munitVersion % Test,
131-
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
132-
),
127+
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
133128
sharedSettings
134129
)
135130
.settings(
@@ -141,10 +136,16 @@ lazy val reporter =
141136
project
142137
.settings(
143138
name := "scalac-scoverage-reporter",
144-
libraryDependencies ++= Seq(
145-
"org.scala-lang.modules" %% "scala-xml" % "2.0.0",
146-
"org.scalameta" %% "munit" % munitVersion % Test
147-
),
139+
libraryDependencies += CrossVersion
140+
.partialVersion(
141+
scalaVersion.value
142+
)
143+
.map {
144+
// Lock this for 2.12 to align with the compiler
145+
// https://github.com/scala/scala/pull/9743
146+
case ((2, 12)) => "org.scala-lang.modules" %% "scala-xml" % "1.0.6"
147+
case _ => "org.scala-lang.modules" %% "scala-xml" % "2.0.1"
148+
},
148149
sharedSettings,
149150
crossScalaVersions := Seq(defaultScala212, defaultScala213, defaultScala3)
150151
)
@@ -154,9 +155,6 @@ lazy val domain =
154155
project
155156
.settings(
156157
name := "scalac-scoverage-domain",
157-
libraryDependencies ++= Seq(
158-
"org.scalameta" %% "munit" % munitVersion % Test
159-
),
160158
sharedSettings,
161159
crossScalaVersions := Seq(defaultScala212, defaultScala213, defaultScala3)
162160
)
@@ -165,9 +163,6 @@ lazy val serializer =
165163
project
166164
.settings(
167165
name := "scalac-scoverage-serializer",
168-
libraryDependencies ++= Seq(
169-
"org.scalameta" %% "munit" % munitVersion % Test
170-
),
171166
sharedSettings,
172167
crossScalaVersions := Seq(defaultScala212, defaultScala213, defaultScala3)
173168
)

0 commit comments

Comments
 (0)