Skip to content

Commit 93ff078

Browse files
committed
Replace scala_register_unused_deps_toolchains call
Missed this one in third_party/test/proto earlier. Also removed unnecessary `USE_BAZEL_VERSION` expression in test_scala_proto_library.sh. If `USE_BAZEL_VERSION` is set, it takes precedence to begin with, and third_party/test/proto/.bazelversion exists now after #1629.
1 parent f0d41c6 commit 93ff078

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

test/shell/test_scala_proto_library.sh

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ test_scala_proto_show_generator_exception() {
2828
--extra_toolchains=//test/proto/custom_generator:failing_scala_proto_toolchain
2929
}
3030

31-
export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat ../../../.bazelversion)}
3231
$runner test_scala_proto_library_action_label
3332
$runner test_scala_proto_custom_generator
3433
$runner test_scala_proto_show_generator_exception

third_party/test/proto/WORKSPACE

+4-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
3535

3636
scala_toolchains()
3737

38-
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
38+
register_toolchains(
39+
"@io_bazel_rules_scala//scala:unused_dependency_checker_error_toolchain",
40+
"@io_bazel_rules_scala_toolchains//...:all",
41+
)
3942

4043
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4144

@@ -60,7 +63,3 @@ scala_proto_repositories()
6063
load("@io_bazel_rules_scala//scala_proto:toolchains.bzl", "scala_proto_register_toolchains")
6164

6265
scala_proto_register_toolchains()
63-
64-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_unused_deps_toolchains")
65-
66-
scala_register_unused_deps_toolchains()

0 commit comments

Comments
 (0)