tidy up bazel_rulies

bazeltools · Nov 28, 2023 · be34a02 · be34a02
1 parent c8876ef
commit be34a02
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 238 deletions.
diff --git a/bazel_rules/bsp_target.bzl b/bazel_rules/bsp_target.bzl
diff --git a/..._rules/private/bsp_target_info_aspect.bzl → bazel_rules/bsp_target_info_aspect.bzl b/..._rules/private/bsp_target_info_aspect.bzl → bazel_rules/bsp_target_info_aspect.bzl
diff --git a/bazel_rules/private/bsp_target_rules.bzl b/bazel_rules/private/bsp_target_rules.bzl
diff --git a/bazel_rules/private/gather_semanticdb.sh b/bazel_rules/private/gather_semanticdb.sh
diff --git a/bazel_rules/private/sources_aspect.bzl b/bazel_rules/private/sources_aspect.bzl
diff --git a/bazel_rules/src_aspect.bzl b/bazel_rules/src_aspect.bzl
diff --git a/examples/simple-no-errors/src/BUILD.bazel b/examples/simple-no-errors/src/BUILD.bazel
@@ -1,14 +1,8 @@
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary")
-load("@bsp4bazel-rules//:bsp_target.bzl", "bsp_target")
 
 scala_binary(
     name = "main_run",
     main_class = "example.Main",
     visibility = ["//visibility:public"],
     deps = ["//src/example"],
 )
-
-bsp_target(
-    name = "src_bsp",
-    target = ":main_run",
-)
diff --git a/examples/simple-no-errors/src/example/foo/BUILD.bazel b/examples/simple-no-errors/src/example/foo/BUILD.bazel
@@ -1,13 +1,7 @@
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-load("@bsp4bazel-rules//:bsp_target.bzl", "bsp_target")
 
 scala_library(
     name = "foo",
     srcs = glob(["*.scala"]),
     visibility = ["//visibility:public"],
 )
-
-bsp_target(
-    name = "foo_bsp",
-    target = ":foo",
-)
diff --git a/examples/simple-with-errors/src/BUILD.bazel b/examples/simple-with-errors/src/BUILD.bazel
@@ -1,15 +1,8 @@
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary")
-load("@bsp4bazel-rules//:bsp_target.bzl", "bsp_target")
 
 scala_binary(
     name = "main_run",
     main_class = "example.Main",
     visibility = ["//visibility:public"],
     deps = ["//src/example"],
 )
-
-bsp_target(
-    name = "src_bsp",
-    target = ":main_run",
-)
-
diff --git a/examples/simple-with-errors/src/example/foo/BUILD.bazel b/examples/simple-with-errors/src/example/foo/BUILD.bazel
@@ -1,13 +1,7 @@
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-load("@bsp4bazel-rules//:bsp_target.bzl", "bsp_target")
 
 scala_library(
     name = "foo",
     srcs = glob(["*.scala"]),
     visibility = ["//visibility:public"],
 )
-
-bsp_target(
-    name = "foo_bsp",
-    target = ":foo",
-)
diff --git a/src/main/scala/bazeltools/bsp4bazel/runner/BspTaskRunner.scala b/src/main/scala/bazeltools/bsp4bazel/runner/BspTaskRunner.scala
@@ -180,7 +180,7 @@ case class BspTaskRunner(workspaceRoot: Path, runner: BazelRunner):
         bazelLabel,
         (
           "--aspects",
-          "@bsp4bazel-rules//private:bsp_target_info_aspect.bzl%bsp_target_info_aspect"
+          "@bsp4bazel-rules//:bsp_target_info_aspect.bzl%bsp_target_info_aspect"
         ),
         ("--output_groups", "bsp_output")
       )

diff --git a/src/test/scala/bazeltools/bsp4bazel/runner/BazelRunnerTest.scala b/src/test/scala/bazeltools/bsp4bazel/runner/BazelRunnerTest.scala
@@ -76,7 +76,6 @@ class BazelRunnerTest extends munit.CatsEffectSuite:
         List(
           "//src/example:example",
           "//src/example/foo:foo",
-          "//src/example/foo:foo_bsp"
         )
       )
     }