Skip to content
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

Upgrade to sbt 1 #3872

Merged
merged 107 commits into from
Apr 12, 2018
Merged

Upgrade to sbt 1 #3872

merged 107 commits into from
Apr 12, 2018

Conversation

allanrenucci
Copy link
Contributor

@allanrenucci allanrenucci commented Jan 19, 2018

Rebased #3441. Reviews still need to be addressed

Unintentionally closed #3687

smarter and others added 30 commits November 13, 2017 07:49
First draft at fixing the sbt bridge to match the Zinc 1.0 API.
After sbt/zinc#101, SimpleType simply doesn't exist anymore.
Some of sbt's callbacks need the full name of the class that can only be
accessed during the first step of the GenBCode pipeline.
So we call the callbacks in the first step, generating at the same time
the class files, and keep those files through the whole pipeline so the
last step can write the bytecode in them.
A FileConflictException may occure when creating a class file.
Add check for this error and refactor a bit of code around it.
That test depended on NameHashing being disabled, which is no longer
supported with Zinc 1.0
It isn't passing in sbt/sbt either. See sbt/sbt#3691
It has been changed in sbt/zinc.
allanrenucci and others added 5 commits March 21, 2018 11:49
This release contains a fix allowing us to remove the workaround added
a few commits earlier.
sbt/zinc@9397b6a#diff-ea135f2f26f43e40ff045089da221e1e
introduced a new constructor for ScalaInstance and deprecated the old
one. We use the new one but don't call it with the proper arguments. It
shouldn't matter though as the enw constructor was introduced to fix an
issue with `sbt run` that only occurs when `(fork in run) := false`.
Copy link
Member

@smarter smarter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ship it ! 🔥 🔥 🔥

@allanrenucci allanrenucci merged commit f7d5fe4 into scala:master Apr 12, 2018
@allanrenucci allanrenucci deleted the topic/sbt1 branch April 12, 2018 14:53
@liufengyun
Copy link
Contributor

Benchmarks work without problem 👍

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.

None yet

6 participants