Fix remaining incompatible changes warnings #480
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
please take a look @ittaiz |
johnynek
commented
Apr 12, 2018
scala/scala.bzl
Outdated
|
|
||
|
|
||
| def _expand_location(ctx, flags): | ||
| return [ctx.expand_location(f, ctx.attr.data) for f in flags] | ||
|
|
||
| def _sort_join_path(args, sep=","): | ||
| return sep.join(sorted([f.path for f in args])) |
There was a problem hiding this comment.
this sorting is not needed. Depsets have stable orderings so we don't need to sort again to achieve that.
https://docs.bazel.build/versions/master/skylark/lib/depset.html
|
okay, I think this is finally ready to go. I added tests to check with all_incompatible_changes, and I test it in strict deps mode and regular mode. I think we are finally in good shape here... If we can use modern providers everywhere and not break intellij we may be all caught up. |
|
cc @andyscott |
|
@ittaiz can we merge this? I think it is ready to go |
ittaiz
approved these changes
Apr 16, 2018
cushon
added a commit
to cushon/rules_scala
that referenced
this pull request
Apr 24, 2018
Fixes: ERROR: test/proto/BUILD:36:1: in scala_proto_srcjar rule //test/proto:test_proto_java_conversions_srcjar: Traceback (most recent call last): File "test/proto/BUILD", line 36 scala_proto_srcjar(name = 'test_proto_java_conversions_srcjar') File "scala_proto/scala_proto.bzl", line 332, in _gen_proto_srcjar_impl transitive_proto_paths += target.proto.transitive_proto_path `+` operator on a depset is forbidden. See https://docs.bazel.build/versions/master/skylark/depsets.html for recommendations. Use --incompatible_depset_union=false to temporarily disable this check. See also bazelbuild#480
ianoc-stripe
pushed a commit
to ianoc-stripe/rules_scala
that referenced
this pull request
Jun 12, 2018
* Fix remaining incompatible changes warnings * add tests, fix test for strict deps
ianoc-stripe
pushed a commit
to ianoc-stripe/rules_scala
that referenced
this pull request
Jun 12, 2018
Fixes: ERROR: test/proto/BUILD:36:1: in scala_proto_srcjar rule //test/proto:test_proto_java_conversions_srcjar: Traceback (most recent call last): File "test/proto/BUILD", line 36 scala_proto_srcjar(name = 'test_proto_java_conversions_srcjar') File "scala_proto/scala_proto.bzl", line 332, in _gen_proto_srcjar_impl transitive_proto_paths += target.proto.transitive_proto_path `+` operator on a depset is forbidden. See https://docs.bazel.build/versions/master/skylark/depsets.html for recommendations. Use --incompatible_depset_union=false to temporarily disable this check. See also bazelbuild#480
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the remaining issues to resolve #430. With this, I can pass all tests using
--all_incompatible_changes.We test both strict deps and without strict deps to make sure we can pass with the all_incompatible_changes. Since the build should be exactly the same, the cache works when things pass, so it doesn't really increase CI time.