use bind to remove loader-specific labels in dependencies (#980)

* use bind to remove loader-specific labels in dependencies * remove redundant bind
bazelbuild · Mar 4, 2020 · a2f5852 · a2f5852
1 parent cbb4cbe
commit a2f5852
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/scala/BUILD b/scala/BUILD
@@ -45,17 +45,17 @@ java_import(
 _declare_scalac_provider(
     name = "scalac_default",
     default_classpath = [
-        "@io_bazel_rules_scala_scala_library",
-        "@io_bazel_rules_scala_scala_reflect",
+        "//external:io_bazel_rules_scala/dependency/scala/scala_library",
+        "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
     ],
     default_macro_classpath = [
-        "@io_bazel_rules_scala_scala_library",
-        "@io_bazel_rules_scala_scala_reflect",
+        "//external:io_bazel_rules_scala/dependency/scala/scala_library",
+        "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
     ],
     default_repl_classpath = [
-        "@io_bazel_rules_scala_scala_library",
-        "@io_bazel_rules_scala_scala_reflect",
-        "@io_bazel_rules_scala_scala_compiler",
+        "//external:io_bazel_rules_scala/dependency/scala/scala_library",
+        "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
+        "//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
     ],
     visibility = ["//visibility:public"],
 )

diff --git a/scala/private/macros/scala_repositories.bzl b/scala/private/macros/scala_repositories.bzl
@@ -232,3 +232,13 @@ def scala_repositories(
         name = "io_bazel_rules_scala/dependency/scala/guava",
         actual = "@io_bazel_rules_scala_guava",
     )
+
+    native.bind(
+        name = "io_bazel_rules_scala/dependency/scala/scalatest/scalatest",
+        actual = "@io_bazel_rules_scala_scalatest",
+    )
+
+    native.bind(
+        name = "io_bazel_rules_scala/dependency/scala/scalactic/scalactic",
+        actual = "@io_bazel_rules_scala_scalactic",
+    )
diff --git a/scala/scalatest/BUILD b/scala/scalatest/BUILD
@@ -6,7 +6,7 @@ scala_import(
     name = "scalatest",
     jars = [],
     exports = [
-        "@io_bazel_rules_scala_scalactic",
-        "@io_bazel_rules_scala_scalatest",
+        "//external:io_bazel_rules_scala/dependency/scala/scalactic/scalactic",
+        "//external:io_bazel_rules_scala/dependency/scala/scalatest/scalatest",
     ],
 )
diff --git a/src/java/io/bazel/rulesscala/scalac/BUILD b/src/java/io/bazel/rulesscala/scalac/BUILD
@@ -21,10 +21,10 @@ java_binary(
     visibility = ["//visibility:public"],
     deps = [
         ":exported_scalac_repositories_from_toolchain_to_jvm",
+        "//external:io_bazel_rules_scala/dependency/commons_io/commons_io",
         "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
         "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar",
         "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker",
-        "@scalac_rules_commons_io//jar",
     ],
 )