Skip to content

Commit 1a269e1

Browse files
committed
Fix #5597: Remove scala-xml dependency, add it to the community-build
This means that our test suites can no longer contain xml tests, instead they need to be added to scala-xml like this: scala/scala-xml@9762438
1 parent 2c26c17 commit 1a269e1

File tree

10 files changed

+12
-27
lines changed

10 files changed

+12
-27
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@
3737
[submodule "community-build/community-projects/sourcecode"]
3838
path = community-build/community-projects/sourcecode
3939
url = https://github.com/dotty-staging/sourcecode
40+
[submodule "community-build/community-projects/scala-xml"]
41+
path = community-build/community-projects/scala-xml
42+
url = https://github.com/scala/scala-xml
Submodule scala-xml added at 19f53ad

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ class CommunityBuildTest {
109109
updateCommand = "scalatest/update"
110110
)
111111

112+
@Test def scalaXml = test(
113+
project = "scala-xml",
114+
testCommand = "xml/test",
115+
updateCommand = "xml/update"
116+
)
117+
112118
@Test def scopt = test(
113119
project = "scopt",
114120
testCommand = "scoptJVM/compile",

compiler/test/dotty/Properties.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ object Properties {
5959
/** scala-asm jar */
6060
def scalaAsm: String = sys.props("dotty.tests.classes.scalaAsm")
6161

62-
/** scala-xml jar */
63-
def scalaXml: String = sys.props("dotty.tests.classes.scalaXml")
64-
6562
/** jline-terminal jar */
6663
def jlineTerminal: String = sys.props("dotty.tests.classes.jlineTerminal")
6764

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object TestConfiguration {
1212
)
1313

1414
val checkOptions = Array(
15-
// "-Yscala2-unpickler", s"${Properties.scalaLibrary}:${Properties.scalaXml}",
15+
// "-Yscala2-unpickler", s"${Properties.scalaLibrary}",
1616
"-Yno-deep-subtypes",
1717
"-Yno-double-bindings",
1818
"-Yforce-sbt-phases",
@@ -21,13 +21,11 @@ object TestConfiguration {
2121

2222
val basicClasspath = mkClasspath(List(
2323
Properties.scalaLibrary,
24-
Properties.scalaXml,
2524
Properties.dottyLibrary
2625
))
2726

2827
val withCompilerClasspath = mkClasspath(List(
2928
Properties.scalaLibrary,
30-
Properties.scalaXml,
3129
Properties.scalaAsm,
3230
Properties.jlineTerminal,
3331
Properties.jlineReader,

project/Build.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,6 @@ object Build {
450450
// get libraries onboard
451451
libraryDependencies ++= Seq(
452452
"org.scala-lang.modules" % "scala-asm" % "6.0.0-scala-1", // used by the backend
453-
// FIXME: Not needed, but should be on the compiler CP
454-
("org.scala-lang.modules" %% "scala-xml" % "1.1.0").withDottyCompat(scalaVersion.value),
455453
"org.scala-lang" % "scala-library" % scalacVersion % "test",
456454
Dependencies.`compiler-interface`,
457455
"org.jline" % "jline-reader" % "3.9.0", // used by the REPL
@@ -515,7 +513,6 @@ object Build {
515513
"-Ddotty.tests.classes.compilerInterface=" + findLib(attList, "compiler-interface"),
516514
"-Ddotty.tests.classes.scalaLibrary=" + findLib(attList, "scala-library-"),
517515
"-Ddotty.tests.classes.scalaAsm=" + findLib(attList, "scala-asm"),
518-
"-Ddotty.tests.classes.scalaXml=" + findLib(attList, "scala-xml"),
519516
"-Ddotty.tests.classes.jlineTerminal=" + findLib(attList, "jline-terminal"),
520517
"-Ddotty.tests.classes.jlineReader=" + findLib(attList, "jline-reader")
521518
)

tests/pos/i1976.scala

Lines changed: 0 additions & 4 deletions
This file was deleted.

tests/pos/xml-attribute-block.scala

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/pos/xml-pos.scala

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)