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

Hand over post-compile resources to zinc wrapper to keep classes/ and z.jar consistent #7932

Merged
merged 20 commits into from Jun 26, 2019

Conversation

Projects
None yet
2 participants
@wisechengyi
Copy link
Contributor

commented Jun 22, 2019

Fix for #7869

Problem

Prior to 5d44e7e, annotation processor's notation,
META-INF/services/javax.annotation.processing.Processor,
was merged with zinc outputs by Pants. However the change caused the classpath jar (z.jar) to have inconsistent content compared to the output classes dir.

Solution

Hand off the responsibility of adding post compile resources into z.jar to zinc wrapper instead.

Results

See tests added.

rm
@wisechengyi

This comment has been minimized.

Copy link
Contributor Author

commented Jun 22, 2019

will also add the tests from master...twitter:stuhood/fix-annotation-processors-with-compile-jars.

was able to pass the sanity tests with the previously failing internal target.

@stuhood
Copy link
Member

left a comment

Thanks!

@wisechengyi
Copy link
Contributor Author

left a comment

Added the tests and passed locally. pending zinc wrapper publishing.

wisechengyi added some commits Jun 24, 2019

@wisechengyi wisechengyi changed the title [WIP] Hand off post compile resources to zinc wrapper Hand off post compile resources to zinc wrapper to keep classes/ and z.jar consistent Jun 25, 2019

@wisechengyi wisechengyi changed the title Hand off post compile resources to zinc wrapper to keep classes/ and z.jar consistent Hand over post compile resources to zinc wrapper to keep classes/ and z.jar consistent Jun 25, 2019

@wisechengyi wisechengyi changed the title Hand over post compile resources to zinc wrapper to keep classes/ and z.jar consistent Hand over post-compile resources to zinc wrapper to keep classes/ and z.jar consistent Jun 25, 2019

@wisechengyi

This comment has been minimized.

Copy link
Contributor Author

commented Jun 25, 2019

@stuhood ready for another look. The failing shard seems unrelated, and it appears to be failing on master as well.

@stuhood
Copy link
Member

left a comment

Awesome, thanks!

@wisechengyi

This comment has been minimized.

Copy link
Contributor Author

commented Jun 26, 2019

Merging this one since CI errors are related to https://travis-ci.community/t/continuous-maven-repo-403/3908/5

@wisechengyi wisechengyi merged commit 9032611 into pantsbuild:master Jun 26, 2019

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details

@wisechengyi wisechengyi deleted the wisechengyi:post_merge branch Jun 26, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.