diff options
| author | Seth Tisue <seth@tisue.net> | 2015-07-24 23:57:05 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-07-24 23:57:05 -0400 |
| commit | d7cf43f6933f6cdcca253ae5792ad9325da35ecf (patch) | |
| tree | 3043486eb4c4becdfc6cfe698bedc3a82f9abb02 | |
| parent | aae695ed5aac7cd9724ef68f6366d21e812f4457 (diff) | |
| parent | efe5c115001a615ec3f04464440173c9c59ff9ec (diff) | |
| download | scala-d7cf43f6933f6cdcca253ae5792ad9325da35ecf.tar.gz scala-d7cf43f6933f6cdcca253ae5792ad9325da35ecf.tar.bz2 scala-d7cf43f6933f6cdcca253ae5792ad9325da35ecf.zip | |
Merge pull request #4658 from SethTisue/remove-xml-coalescing-hack
remove temporary XML coalescing hack we used to build M2
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 3 | ||||
| -rw-r--r-- | versions.properties | 2 |
2 files changed, 2 insertions, 3 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 } diff --git a/versions.properties b/versions.properties index e18229ae26..9f8031d3ba 100644 --- a/versions.properties +++ b/versions.properties @@ -22,7 +22,7 @@ starr.version=2.12.0-M2 scala.binary.version=2.12.0-M2 # external modules shipped with distribution, as specified by scala-library-all's pom -scala-xml.version.number=1.0.4 +scala-xml.version.number=1.0.5 scala-parser-combinators.version.number=1.0.4 scala-swing.version.number=2.0.0-M2 scala-swing.version.osgi=2.0.0.M2 |