Skip to content

Commit 6da4273

Browse files
committed
Move jvm_flags to build settings
1 parent be4046f commit 6da4273

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

scala/scala_toolchain.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ _config_attrs = {
8585
default = False,
8686
doc = "Changes java binaries scripts (including tests) to use argument files and not classpath jars to improve performance, requires java > 8",
8787
),
88+
"scalac_jvm_flags": attr.string_list(),
89+
"scala_test_jvm_flags": attr.string_list(),
8890
}
8991

9092
_config_flags = {
@@ -189,8 +191,6 @@ _scala_toolchain = rule(
189191
),
190192
"jacocorunner": attr.label(default = Label("@bazel_tools//tools/jdk:JacocoCoverage")),
191193
"scalacopts": attr.string_list(),
192-
"scalac_jvm_flags": attr.string_list(),
193-
"scala_test_jvm_flags": attr.string_list(),
194194
"_scala_version": attr.label(default = "@io_bazel_rules_scala_config//:scala_version"),
195195
"_scala_toolchain_flags": attr.label(default = "//scala/settings:scala_toolchain_flags"),
196196
},

scala/settings/BUILD

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,13 @@ bool_flag(
100100
name = "use_argument_file_in_runner",
101101
build_setting_default = False,
102102
)
103+
104+
string_list_flag(
105+
name = "scalac_jvm_flags",
106+
build_setting_default = [],
107+
)
108+
109+
string_list_flag(
110+
name = "scala_test_jvm_flags",
111+
build_setting_default = [],
112+
)

0 commit comments

Comments
 (0)