diff options
| author | Seth Tisue <seth@tisue.net> | 2015-07-21 17:37:06 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-07-21 17:37:06 -0400 |
| commit | efe5c115001a615ec3f04464440173c9c59ff9ec (patch) | |
| tree | 6ef02ae74045c4eaab2c3c1e4e40c3aee431d733 /scripts | |
| parent | 100a234882a86a249ebe586b4e75fede58c098c3 (diff) | |
| download | scala-efe5c115001a615ec3f04464440173c9c59ff9ec.tar.gz scala-efe5c115001a615ec3f04464440173c9c59ff9ec.tar.bz2 scala-efe5c115001a615ec3f04464440173c9c59ff9ec.zip | |
remove temporary XML coalescing hack we used to build M2
scala-xml 1.0.5 has the fix we need in order to run the scala-xml
tests normally during bootstrapping.
reverts 83554a3c0fb2b57efa293efcc81a947b98a19469
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index c6935df936..706a20daf4 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -217,8 +217,7 @@ buildXML() { then echo "Found scala-xml $XML_VER; not building." else update scala scala-xml "$XML_REF" && gfxd - # TODO: compile under 2.12 source level once `scala.xml.XMLTest.escape` is fixed (see #4451) - sbtBuild 'set scalacOptions += "-Xsource:2.11"' 'set version := "'$XML_VER'-DOC"' $clean doc 'set version := "'$XML_VER'"' test "${buildTasks[@]}" + sbtBuild 'set version := "'$XML_VER'-DOC"' $clean doc 'set version := "'$XML_VER'"' test "${buildTasks[@]}" XML_BUILT="yes" # ensure the module is built and published when buildXML is invoked for the second time, see comment above fi } |