Skip to content

Remove jvm_flags debug print for scala_library #840

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

Merged
merged 3 commits into from
Sep 3, 2019
Merged

Remove jvm_flags debug print for scala_library #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1db7ead
remove jvm_flags debug print for scala_library
long-stripe Sep 3, 2019
9589de5
hard fail for jvm_flags in scala_library, re-add jvm_flags attr for o…
long-stripe Sep 3, 2019
895da07
remove fail, not needed if attr isn't supported
long-stripe Sep 3, 2019
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/common_attributes.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ common_attrs_for_plugin_bootstrapping = {
"resource_jars": attr.label_list(allow_files = True),
"scalacopts": attr.string_list(),
"javacopts": attr.string_list(),
"jvm_flags": attr.string_list(),
"scalac_jvm_flags": attr.string_list(),
"javac_jvm_flags": attr.string_list(),
"expect_java_output": attr.bool(
Expand Down
1 change: 1 addition & 0 deletions scala/private/rules/scala_binary.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def _scala_binary_impl(ctx):
_scala_binary_attrs = {
"main_class": attr.string(mandatory = True),
"classpath_resources": attr.label_list(allow_files = True),
"jvm_flags": attr.string_list(),
}

_scala_binary_attrs.update(launcher_template)
Expand Down
1 change: 1 addition & 0 deletions scala/private/rules/scala_junit_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ _scala_junit_test_attrs = {
default = False,
mandatory = False,
),
"jvm_flags": attr.string_list(),
"_junit": attr.label(
default = Label(
"//external:io_bazel_rules_scala/dependency/junit/junit",
Expand Down
2 changes: 0 additions & 2 deletions scala/private/rules/scala_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@ def _lib(
##

def _scala_library_impl(ctx):
if ctx.attr.jvm_flags:
Copy link
Contributor

@johnynek johnynek Sep 3, 2019

Choose a reason for hiding this comment

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

Do we not need to change the rule to make using them an error?

print("'jvm_flags' for scala_library is deprecated. It does nothing today and will be removed from scala_library to avoid confusion.")
scalac_provider = get_scalac_provider(ctx)
unused_dependency_checker_mode = get_unused_dependency_checker_mode(ctx)
return _lib(
Expand Down
4 changes: 3 additions & 1 deletion scala/private/rules/scala_repl.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ trap finish EXIT

return out

_scala_repl_attrs = {}
_scala_repl_attrs = {
"jvm_flags": attr.string_list(),
}

_scala_repl_attrs.update(launcher_template)

Expand Down
1 change: 1 addition & 0 deletions scala/private/rules/scala_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ _scala_test_attrs = {
),
"colors": attr.bool(default = True),
"full_stacktraces": attr.bool(default = True),
"jvm_flags": attr.string_list(),
"_scalatest": attr.label(
default = Label(
"//external:io_bazel_rules_scala/dependency/scalatest/scalatest",
Expand Down
8 changes: 0 additions & 8 deletions test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,6 @@ scala_library(
srcs = glob(["src/main/scala/scalarules/test/mix_java_scala/*.scala"]) + glob([
"src/main/scala/scalarules/test/mix_java_scala/*.java",
]),
jvm_flags = [
"-Xms1G",
"-Xmx4G",
],
)

genrule(
Expand Down Expand Up @@ -323,10 +319,6 @@ scala_library(
# srcjar created with `jar -cfM Baz.srcjar Baz.java`
"src/main/scala/scalarules/test/mix_java_scala/*.srcjar",
]),
jvm_flags = [
"-Xms1G",
"-Xmx4G",
],
)

#needed to test java sources are compiled
Expand Down