Skip to content

Commit

Permalink
fixup! 9ef6647 Updated a missed call to configure_zinc_scala
Browse files Browse the repository at this point in the history
  • Loading branch information
Jaden Peterson committed Sep 24, 2024
1 parent 3d8dfb9 commit bc086ff
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 2 additions & 0 deletions tests/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ scala_register_toolchains(
"@@//dependencies/indirect:test_zinc_2_13_direct_deps_off",
"@@//dependencies/indirect:test_zinc_2_13_used_deps_off",
"@@//plugins/kind-projector:test_zinc_2_13_with_kind_projector",
"@@//plugins/semanticdb:scala_2_13_with_semanticdb",
"@@//plugins/semanticdb:scala_3_with_semanticdb",
"@@//scala:test_bootstrap_2_12",
"@@//scala:test_bootstrap_2_13",
"@@//scala:test_bootstrap_3",
Expand Down
11 changes: 6 additions & 5 deletions tests/plugins/semanticdb/BUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
load("@rules_scala_annex//rules:scala.bzl", "configure_zinc_scala", "scala_library")
load("@rules_scala_annex//rules:register_toolchain.bzl", "register_zinc_toolchain")
load("@rules_scala_annex//rules:scala.bzl", "scala_library")
load("@rules_scala_annex//rules/scala:workspace.bzl", "scala_2_13_version", "scala_3_version")

configure_zinc_scala(
register_zinc_toolchain(
name = "scala_2_13_with_semanticdb",
compiler_bridge = "@annex//:org_scala_sbt_compiler_bridge_2_13",
compiler_classpath = [
Expand All @@ -15,7 +16,7 @@ configure_zinc_scala(
version = scala_2_13_version,
)

configure_zinc_scala(
register_zinc_toolchain(
name = "scala_3_with_semanticdb",
compiler_bridge = "@annex//:org_scala_lang_scala3_sbt_bridge",
compiler_classpath = [
Expand All @@ -35,13 +36,13 @@ configure_zinc_scala(
scala_library(
name = "semanticdb-2_13",
srcs = glob(["*.scala"]),
scala = ":scala_2_13_with_semanticdb",
scala_toolchain_name = "scala_2_13_with_semanticdb",
tags = ["manual"],
)

scala_library(
name = "semanticdb-3",
srcs = glob(["*.scala"]),
scala = ":scala_3_with_semanticdb",
scala_toolchain_name = "scala_3_with_semanticdb",
tags = ["manual"],
)

0 comments on commit bc086ff

Please sign in to comment.