Skip to content

Commit ba71506

Browse files
committed
refactor scalac deps
Refactor SCALAC_DEPS parameter to a Starlark file to make it reusable for users. See #1674 for a possible usecase.
1 parent ca27760 commit ba71506

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/java/io/bazel/rulesscala/scalac/BUILD

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
load("@rules_java//java:defs.bzl", "java_binary")
21
load("@io_bazel_rules_scala_config//:config.bzl", "ENABLE_COMPILER_DEPENDENCY_TRACKING")
2+
load("@rules_java//java:defs.bzl", "java_binary")
33
load("//scala:scala_cross_version_select.bzl", "select_for_scala_version")
4-
5-
SCALAC_DEPS = [
6-
"//scala/private/toolchain_deps:scala_compile_classpath",
7-
"//src/java/io/bazel/rulesscala/io_utils",
8-
"@bazel_tools//src/main/protobuf:worker_protocol_java_proto",
9-
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar",
10-
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker",
11-
"@io_bazel_rules_scala//src/protobuf/io/bazel/rules_scala:diagnostics_java_proto",
12-
"//src/java/io/bazel/rulesscala/scalac/compileoptions",
13-
"//src/java/io/bazel/rulesscala/scalac/reporter",
14-
]
4+
load("//src/java/io/bazel/rulesscala/scalac:deps.bzl", "SCALAC_DEPS")
155

166
java_binary(
177
name = "scalac",
@@ -48,8 +38,8 @@ java_binary(
4838
filegroup(
4939
name = "scalac_files",
5040
srcs = [
51-
"ScalacWorker.java",
5241
"ScalacInvokerResults.java",
42+
"ScalacWorker.java",
5343
] + select_for_scala_version(
5444
any_2 = glob(["scala_2/*.java"]),
5545
any_3 = glob(["scala_3/*.java"]),
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
SCALAC_DEPS = [
2+
"//scala/private/toolchain_deps:scala_compile_classpath",
3+
"//src/java/io/bazel/rulesscala/io_utils",
4+
"@bazel_tools//src/main/protobuf:worker_protocol_java_proto",
5+
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar",
6+
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker",
7+
"@io_bazel_rules_scala//src/protobuf/io/bazel/rules_scala:diagnostics_java_proto",
8+
"//src/java/io/bazel/rulesscala/scalac/compileoptions",
9+
"//src/java/io/bazel/rulesscala/scalac/reporter",
10+
]

0 commit comments

Comments
 (0)