Skip to content

merge 2.11.x onto 2.12.x #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jan 27, 2016
Merged

Conversation

SethTisue
Copy link
Member

we already merged the sbt-native-packager upgrade onto 2.12.x,
so we'll want the same fixes to that that 2.11.x already got

SethTisue and others added 16 commits November 19, 2015 16:29
…ins"

This reverts commit 1da1582
because it doesn't work on Windows; see
scala#142 for discussion.
FIX scala#141 Upgrading to native-packager 1.0.4 and autoplugins
associated with upgrade of sbt-native-packager to 1.0.4
…ression

fix regression in naming of doc bundle
this happened when we upgraded sbt-native-packager from 0.6.x
to 1.0.x; the new version calculates this differently
because warnings are a good thing & we want to see them
.deb naming regression fix, plus some random code improvement
we recently upgraded to 1.0.4, but that caused a regression so the
change never received full testing yet.  the regression has bene
fixed, so as long as we're going to do a new round of testing, let's
test the latest latest
just on general dogfooding principle. delicious gravy!
upgrade to sbt-native-packager 1.0.6 and sbt 0.13.9
where some doc tasks were invoking `tar` without any flags at all
see scala/scala-dev#74
…ssion

work around regression in sbt-native-packager 1.0.5
SethTisue added a commit that referenced this pull request Jan 27, 2016
@SethTisue SethTisue merged commit 45eccc4 into scala:2.12.x Jan 27, 2016
@SethTisue SethTisue deleted the merge-211-onto-212 branch January 27, 2016 20:16
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.

2 participants