Update with the latest changes from bazelbuild/rules_scala 08032021 #11
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
…ter-forks#6) * Add option parsing file * Add OptionParser * Add scopt dependency * Lint reformat
…lbuild#1228) * Support scrooge-generator compiler flags in thrift_library rule (twitter-forks#6) * Add option parsing file * Add OptionParser * Add scopt dependency * Lint reformat * Add option parsing file * Add scopt dependency * Lint reformat * Add test for compiler_args in thrift_library * Fix lint error * Remove option parser from rules_scala code * Add scopt dependency * Update test and clean code
### Description Originally it was unknown to me that we could use flags to directly disable the stamping of scala imports using `build --@io_bazel_rules_scala//scala/settings:stamp_scala_import=False` in the `.bazelrc` file. Discussion in bazelbuild#1232 cleared that up. ### Motivation Reverting twitter-forks#8 as it is not needed.
* Extract strict deps tests into separate shell script * Add test to showcase existing (incorrect) proto stamping behaviour * lint
* Get rid of join in starlark * Remove defaults handling for values which are always passed * Move plugins formatting to ScalacWorker next to plugin params * Move validation from CompileOptions next to others in ScalacWorker * Formatting * Add test for CompilerOptions args file parsing * Remove not required interfaces from CompileOptions.Args * Java naming
cattibrie
force-pushed
the
master
branch
3 times, most recently
from
1125957 to
c8f5d3c
Compare
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.
Description
This PR includes merging conflicts between changes to scrooge-generator introduced first in the fork and later in the bazelbuild/rules_scala.