Skip to content

Commit f0d41c6

Browse files
committed
Remove obsolete WORKSPACE toolchain calls
Should've been included in the previous commit. All tests still pass.
1 parent bd2364a commit f0d41c6

File tree

7 files changed

+0
-32
lines changed

7 files changed

+0
-32
lines changed

examples/crossbuild/WORKSPACE

-4
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
6060

6161
protobuf_deps()
6262

63-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
64-
65-
scala_register_toolchains()
66-
6763
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
6864

6965
scalatest_repositories()

examples/scala3/WORKSPACE

-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,3 @@ rules_proto_toolchains()
5252
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
5353

5454
protobuf_deps()
55-
56-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
57-
58-
scala_register_toolchains()

examples/testing/multi_frameworks_toolchain/WORKSPACE

-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
5656

5757
protobuf_deps()
5858

59-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
60-
61-
scala_register_toolchains()
62-
6359
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories")
6460
load("@io_bazel_rules_scala//testing:junit.bzl", "junit_repositories")
6561
load("@io_bazel_rules_scala//testing:specs2_junit.bzl", "specs2_junit_repositories")

examples/testing/scalatest_repositories/WORKSPACE

-4
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
5353

5454
protobuf_deps()
5555

56-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
57-
58-
scala_register_toolchains()
59-
6056
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
6157

6258
scalatest_repositories()

examples/testing/specs2_junit_repositories/WORKSPACE

-4
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
5353

5454
protobuf_deps()
5555

56-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
57-
58-
scala_register_toolchains()
59-
6056
load("@io_bazel_rules_scala//testing:specs2_junit.bzl", "specs2_junit_repositories", "specs2_junit_toolchain")
6157

6258
specs2_junit_repositories()

test_version/WORKSPACE.template

-8
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,12 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
6363

6464
scala_toolchains(fetch_sources = True)
6565

66-
register_toolchains()
6766
register_toolchains(
6867
"@io_bazel_rules_scala//scala:unused_dependency_checker_error_toolchain",
6968
"@io_bazel_rules_scala//testing:testing_toolchain",
7069
"@io_bazel_rules_scala_toolchains//...:all",
7170
)
7271

73-
74-
load(
75-
"@io_bazel_rules_scala//scala:scala.bzl",
76-
"scala_repositories",
77-
"scala_toolchains_repo",
78-
)
79-
8072
load(":scrooge_repositories.bzl", "scrooge_repositories")
8173
${twitter_scrooge_repositories}
8274
load("@io_bazel_rules_scala//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge")

third_party/test/example_external_workspace/WORKSPACE

-4
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
5353

5454
protobuf_deps()
5555

56-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
57-
58-
scala_register_toolchains()
59-
6056
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
6157

6258
scalatest_repositories()

0 commit comments

Comments
 (0)