Support for selecting scala version #544
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,10 @@ | |
| # limitations under the License. | ||
| """Rules for supporting the Scala language.""" | ||
| load("@io_bazel_rules_scala//scala:scala_toolchain.bzl", "scala_toolchain") | ||
| load( | ||
| "@io_bazel_rules_scala//scala:providers.bzl", | ||
| "create_scala_provider", | ||
| _ScalacProvider = "ScalacProvider") | ||
| load( | ||
| ":common.bzl", | ||
| "add_labels_of_jars_to", | ||
|
|
@@ -222,15 +225,21 @@ StatsfileOutput: {statsfile_output} | |
| ctx.actions.write( | ||
| output = argfile, content = scalac_args + optional_scalac_args) | ||
|
|
||
| scalac_provider = ctx.attr._scalac[_ScalacProvider] | ||
|
There was a problem hiding this comment. @johnynek given your work trying to make There was a problem hiding this comment. Yeah, I’d prefer a parameter right keep function cleaner. Eventually I’d like to not accept ctx and instead only actions. |
||
| scalac_inputs, _, scalac_input_manifests = ctx.resolve_command( | ||
| tools = [scalac_provider.scalac]) | ||
|
|
||
| outs = [output, statsfile] | ||
| ins = ( | ||
| compiler_classpath_jars.to_list() + all_srcjars.to_list() + list(sources) | ||
| + plugins_list + dependency_analyzer_plugin_jars + classpath_resources + | ||
| resources + resource_jars + [manifest, argfile] + scalac_inputs) | ||
|
|
||
| ctx.actions.run( | ||
| inputs = ins, | ||
| outputs = outs, | ||
| executable = scalac_provider.scalac.files_to_run.executable, | ||
|
There was a problem hiding this comment. can you take this from the tuple output ( There was a problem hiding this comment. Doesn't work, command is There was a problem hiding this comment. @laurentlb is this the expected behavior? Sounds strange we can get the inputs and manifests from |
||
| input_manifests = scalac_input_manifests, | ||
| mnemonic = "Scalac", | ||
| progress_message = "scala %s" % target_label, | ||
| execution_requirements = {"supports-workers": "1"}, | ||
|
|
@@ -478,7 +487,8 @@ def _collect_jars_from_common_ctx(ctx, extra_deps = [], | |
| dependency_analyzer_is_off = is_dependency_analyzer_off(ctx) | ||
|
|
||
| # Get jars from deps | ||
| scalac_provider = ctx.attr._scalac[_ScalacProvider] | ||
| auto_deps = [scalac_provider.scalalib, scalac_provider.scalareflect] | ||
|
There was a problem hiding this comment. This could directly be given in the toolchain/provider. |
||
| deps_jars = collect_jars(ctx.attr.deps + auto_deps + extra_deps, | ||
| dependency_analyzer_is_off) | ||
| (cjars, transitive_rjars, jars2labels, | ||
|
|
@@ -616,7 +626,8 @@ def scala_binary_impl(ctx): | |
| def scala_repl_impl(ctx): | ||
| # need scala-compiler for MainGenericRunner below | ||
| jars = _collect_jars_from_common_ctx( | ||
| ctx, | ||
| extra_runtime_deps = [ctx.attr._scalac[_ScalacProvider].scalacompiler]) | ||
| (cjars, transitive_rjars) = (jars.compile_jars, jars.transitive_runtime_jars) | ||
|
|
||
| args = " ".join(ctx.attr.scalacopts) | ||
|
|
@@ -664,6 +675,7 @@ def _scala_test_flags(ctx): | |
| def scala_test_impl(ctx): | ||
| if len(ctx.attr.suites) != 0: | ||
| print("suites attribute is deprecated. All scalatest test suites are run") | ||
|
|
||
| jars = _collect_jars_from_common_ctx( | ||
| ctx, | ||
| extra_runtime_deps = [ | ||
|
|
||
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like the shas need to become a map of scala version -> artifact -> sha.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My understanding is that these maven_jars are just for tests and as they always use
default_scala_version()(which is hardcoded) we shouldn't need a map here. The shas only need to be changed if we changedefault_scala_version(). Or should we add a map just to make the fact that they need to be changed more explicit?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, we should refactor these into a bzl function
load_test_jars()or something to make it clearer. Don't need to do that in this PR.