Fix specs2 deps

bazelbuild · Jul 10, 2020 · a2097e1 · a2097e1
1 parent 6b581f7
commit a2097e1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/specs2/BUILD b/specs2/BUILD
@@ -10,8 +10,9 @@ java_import(
         ":specs2_classpath",
     ],
     deps = [
-        "//scala/private/toolchain_deps:scala_library_classpath",
-        "//scala/private/toolchain_deps:scala_xml",
+        "@io_bazel_rules_scala//scala/private/toolchain_deps:parser_combinators",
+        "@io_bazel_rules_scala//scala/private/toolchain_deps:scala_library_classpath",
+        "@io_bazel_rules_scala//scala/private/toolchain_deps:scala_xml",
     ],
 )
 

diff --git a/specs2/specs2.bzl b/specs2/specs2.bzl
@@ -91,4 +91,4 @@ def specs2_repositories(
     )
 
 def specs2_dependencies():
-    return ["//external:io_bazel_rules_scala/dependency/specs2/specs2"]
+    return ["@io_bazel_rules_scala//specs2:specs2"]
diff --git a/test/aspect/aspect.bzl b/test/aspect/aspect.bzl
@@ -23,36 +23,30 @@ def _rule_impl(ctx):
     expected_deps = {
         "scala_library": [
             "//test/aspect:scala_library",
-            "@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
+            "//scala/private/toolchain_deps:scala_library_classpath",
         ],
         "scala_test": [
             "//test/aspect:scala_test",
-            "@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
-            "@io_bazel_rules_scala//scala/scalatest:scalatest",
+            "//scala/private/toolchain_deps:scala_library_classpath",
+            "//scala/scalatest/toolchain:scalatest_classapth",
         ],
         "scala_junit_test": [
             "//test/aspect:scala_junit_test",
-            "@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
+            "//scala/private/toolchain_deps:scala_library_classpath",
             "@io_bazel_rules_scala_junit_junit//:io_bazel_rules_scala_junit_junit",
             "@io_bazel_rules_scala_org_hamcrest_hamcrest_core//:io_bazel_rules_scala_org_hamcrest_hamcrest_core",
         ],
         "scala_specs2_junit_test": [
             "//test/aspect:scala_specs2_junit_test",
-            "@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
+            "//scala/private/toolchain_deps:scala_library_classpath",
             "@io_bazel_rules_scala_junit_junit//:io_bazel_rules_scala_junit_junit",
             "@io_bazel_rules_scala_org_hamcrest_hamcrest_core//:io_bazel_rules_scala_org_hamcrest_hamcrest_core",
             # From specs2/specs2.bzl:specs2_dependencies()
-            "@io_bazel_rules_scala//specs2:specs2",
-            "@io_bazel_rules_scala_org_specs2_specs2_common//:io_bazel_rules_scala_org_specs2_specs2_common",
-            "@io_bazel_rules_scala_org_specs2_specs2_core//:io_bazel_rules_scala_org_specs2_specs2_core",
-            "@io_bazel_rules_scala_org_specs2_specs2_fp//:io_bazel_rules_scala_org_specs2_specs2_fp",
-            "@io_bazel_rules_scala_org_specs2_specs2_matcher//:io_bazel_rules_scala_org_specs2_specs2_matcher",
-            "@io_bazel_rules_scala_scala_xml//:io_bazel_rules_scala_scala_xml",
-            "@io_bazel_rules_scala_scala_parser_combinators//:io_bazel_rules_scala_scala_parser_combinators",
-            "@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
-            "@io_bazel_rules_scala_scala_reflect//:io_bazel_rules_scala_scala_reflect",
+            "//specs2:specs2",
+            "//scala/private/toolchain_deps:scala_xml",
+            "//scala/private/toolchain_deps:parser_combinators",
             # From specs2/specs2_junit.bzl:specs2_junit_dependencies()
-            "@io_bazel_rules_scala_org_specs2_specs2_junit//:io_bazel_rules_scala_org_specs2_specs2_junit",
+            "//specs2:specs2_junit_classpath",
         ],
     }
     content = ""