Skip to content

[Build] Include missing web assets in scaladoc#5093

Merged
szeiger merged 1 commit intoscala:2.12.xfrom
jodersky:scaladoc-include-assets
May 20, 2016
Merged

[Build] Include missing web assets in scaladoc#5093
szeiger merged 1 commit intoscala:2.12.xfrom
jodersky:scaladoc-include-assets

Conversation

@jodersky
Copy link
Contributor

Running a Scala version that is built with sbt will fail when generating docs, since some required assets are not included in the packaged Scala artifacts. This PR adds the missing assets to the sbt build definition.

cc @SethTisue, the changes are related to the sbt build

@scala-jenkins scala-jenkins added this to the 2.12.0-M5 milestone Apr 11, 2016
@SethTisue SethTisue self-assigned this Apr 13, 2016
@adriaanm adriaanm assigned szeiger and unassigned SethTisue Apr 26, 2016
@lrytz
Copy link
Member

lrytz commented May 2, 2016

could you re-submit this to 2.11.x? this way it will also make it into 2.12.x, we merge forward regularly.

@lrytz lrytz closed this May 2, 2016
@lrytz lrytz reopened this May 2, 2016
@szeiger
Copy link
Contributor

szeiger commented May 19, 2016

LGTM

@lrytz
Copy link
Member

lrytz commented May 19, 2016

this needs a rebase to fix the merge conflict. @szeiger, is it that these files are new in 2.12 scaladoc, so it's not needed in 2.11?

@szeiger
Copy link
Contributor

szeiger commented May 19, 2016

@lrytz I ported the original filter expressions over from ant in 2.11, so I would expect them to be accurate there, but @jodersky should be able to confirm why there are needed in 2.12.

@jodersky
Copy link
Contributor Author

If you publish scala 2.12 with sbt, some assets are not included in the resulting jars and hence, scaladoc will fail.
@lrytz I never checked if the issue is also present in Scala 2.11 just running some tests now

@jodersky
Copy link
Contributor Author

Can't reproduce this on 2.11, I assume the new assets were introduced for scaladoc 2.12 (which looks pretty cool btw :))

@szeiger szeiger merged commit f7b575d into scala:2.12.x May 20, 2016
@adriaanm adriaanm added 2.12 and removed 2.12 labels Oct 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants