diff options
| author | Seth Tisue <seth@tisue.net> | 2015-07-09 11:55:13 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-07-09 11:55:13 -0400 |
| commit | c8110b55a78c830a48e66f3b066d7a060c0d76b2 (patch) | |
| tree | 7959c65deeb88b4341222f6595438c0ca6001833 | |
| parent | 8a5aa6ee74eff54660984078839cea2c2be11116 (diff) | |
| parent | 83554a3c0fb2b57efa293efcc81a947b98a19469 (diff) | |
| download | scala-c8110b55a78c830a48e66f3b066d7a060c0d76b2.tar.gz scala-c8110b55a78c830a48e66f3b066d7a060c0d76b2.tar.bz2 scala-c8110b55a78c830a48e66f3b066d7a060c0d76b2.zip | |
Merge pull request #4614 from adriaanm/scala-xml-211
Bootstrap scala-xml using `-Xsource:2.11`
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index 706a20daf4..c6935df936 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -217,7 +217,8 @@ buildXML() { then echo "Found scala-xml $XML_VER; not building." else update scala scala-xml "$XML_REF" && gfxd - sbtBuild 'set version := "'$XML_VER'-DOC"' $clean doc 'set version := "'$XML_VER'"' test "${buildTasks[@]}" + # 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[@]}" XML_BUILT="yes" # ensure the module is built and published when buildXML is invoked for the second time, see comment above fi } |