Skip to content

[rebased/cherry-picked] Switch to JarsToLabels provider and rework/cleanup scala_import #487

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

Closed
wants to merge 7 commits into from
Closed

[rebased/cherry-picked] Switch to JarsToLabels provider and rework/cleanup scala_import #487

wants to merge 7 commits into from

Conversation

andyscott
Copy link
Contributor

This is a rebased version of #477 plus the addition of @jjudd's changes in https://github.com/andyscott/rules_scala/pull/2.

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@andyscott andyscott changed the title [rebased] Switch to JarsToLabels provider and rework/cleanup scala_import [rebased/cherry-picked] Switch to JarsToLabels provider and rework/cleanup scala_import Apr 29, 2018
@andyscott
Copy link
Contributor Author

andyscott commented Apr 29, 2018

I goofed-- this will need some more work to make sure all the changes were pulled over correctly.
Updated: Fixed some of the goof. I'm not sure if there anything else missing.

@ittaiz
Copy link
Contributor

ittaiz commented Apr 29, 2018 via email

@andyscott
Copy link
Contributor Author

I'm not too attached to this work, but I'll have to defer to @jjudd since he added the more recent changes to make the original refactoring support IntelliJ. Also, given some recent discussions, I wanted to make sure we had a more manageable branch based on recent refactoring.

@jjudd
Copy link
Contributor

jjudd commented Apr 29, 2018

We are running on a branch that has all these changes on it, and things have been working fine. I'm not too attached to this work either, as we'll be switching to Annex internally this week for the Zinc support.

@jjudd
Copy link
Contributor

jjudd commented Apr 29, 2018

Also, I consent to my changes being contributed.

@jjudd jjudd mentioned this pull request Apr 29, 2018
@ittaiz
Copy link
Contributor

ittaiz commented Apr 29, 2018 via email

@andyscott
Copy link
Contributor Author

There's a test or two that's currently broken. I'll have to poke at it later.

# support http_file pointed at a jar. http_jar uses ijar,
# which breaks scala macros
# support http_file pointed at a jar. http_jar uses ijar,
# which breaks scala macros
Copy link
Contributor

Choose a reason for hiding this comment

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

this comment is on the elif, can we move it below or unindent? It feels awkward to me being indented but not related to the current block.

@@ -30,3 +30,10 @@ def create_scala_provider(
transitive_runtime_jars = transitive_runtime_jars,
transitive_exports = [] #needed by intellij plugin
)

JarsToLabels = provider(
Copy link
Contributor

Choose a reason for hiding this comment

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

can we make a link to the bazel discussions about putting labels in the jars?

bazelbuild/bazel#4584

@dflemstr
Copy link

dflemstr commented May 5, 2018

Any progress on this? Would be unfortunate for this to bitrot when we're so close to getting this in.

@ittaiz
Copy link
Contributor

ittaiz commented May 5, 2018 via email

@andyscott andyscott closed this Jun 14, 2018
@andyscott andyscott deleted the andyscott-rework-scala_import-rebased branch June 14, 2018 05:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants