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.

Sign up for GitHub

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

[WIP] see what happens if we drop scala attribute #869

Closed
wants to merge 1 commit into from
Closed

[WIP] see what happens if we drop scala attribute #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion scala/private/rule_impls.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,6 @@ def scala_binary_common(
instrumented_files = outputs.coverage.instrumented_files,
providers = [outputs.merged_provider, jars2labels] + outputs.coverage.providers,
runfiles = runfiles,
scala = scalaattr,
transitive_rjars =
rjars, #calling rules need this for the classpath in the launcher
)
Expand Down
2 changes: 1 addition & 1 deletion scala/private/rules/scala_junit_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def _scala_junit_test_impl(ctx):
if ctx.attr.tests_from:
archives = _get_test_archive_jars(ctx, ctx.attr.tests_from)
else:
archives = [archive.class_jar for archive in out.scala.outputs.jars]
archives = out.providers[0].runtime_output_jars

serialized_archives = _serialize_archives_short_path(archives)
test_suite = _gen_test_suite_flags_based_on_prefixes_and_suffixes(
Expand Down
1 change: 0 additions & 1 deletion scala/private/rules/scala_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ def _lib(
jars_to_labels = jars.jars2labels,
providers = [outputs.merged_provider, jars.jars2labels] + outputs.coverage.providers,
runfiles = runfiles,
scala = scalaattr,
Copy link
Member

Choose a reason for hiding this comment

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

Note above where we construct scalaattr: can we remove that? Indeed can we grep for all calls to create_scala_provider and make sure we aren’t calling that function or that it can be refactored to return a JavaInfo?

)

##
Expand Down
1 change: 0 additions & 1 deletion scala/private/rules/scala_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ def _scala_test_impl(ctx):
instrumented_files = out.instrumented_files,
providers = out.providers,
runfiles = ctx.runfiles(coverage_runfiles, transitive_files = out.runfiles.files),
scala = out.scala,
)

_scala_test_attrs = {
Expand Down
3 changes: 0 additions & 3 deletions scala/scala_import.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ def _scala_import_impl(ctx):
current_target_providers = [_new_java_info(ctx, ctx.file._placeholder_jar)]

return struct(
scala = struct(
outputs = struct(jars = intellij_metadata),
),
providers = [
java_common.merge(current_target_providers),
DefaultInfo(
Expand Down