Skip to content

Commit 7c08700

Browse files
committed
WIP: Bzlmod part the thirty-second
Add scala_proto_rules_protoc_bridge to MODULE.bazel and custom_generator rules that need it. Also added junit_deps to more targets in test/BUILD.
1 parent fb65a66 commit 7c08700

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ use_repo(
7171
"org_springframework_spring_tx",
7272
"org_typelevel__cats_core",
7373
"org_typelevel_kind_projector",
74+
"scala_proto_rules_protoc_bridge",
7475
"scalafmt_default",
7576
)
7677

test/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,7 @@ scala_junit_test(
731731
scala_library(
732732
name = "TargetWithTestThatShouldNotRun",
733733
srcs = ["src/main/scala/scalarules/test/junit/separate_target/FailingTest.scala"],
734+
deps = junit_deps,
734735
)
735736

736737
scala_library(
@@ -785,6 +786,7 @@ scala_library(
785786
srcs = [
786787
"src/main/scala/scalarules/test/junit/runtime_platform/JunitRuntimePlatformTest.java",
787788
],
789+
deps = junit_deps,
788790
# make sure java compilation toolchain matches runtime toolchain ie --target
789791
java_compile_toolchain = "@bazel_tools//tools/jdk:toolchain_java11",
790792
)

test/proto/custom_generator/BUILD.bazel

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,14 @@ scala_library(
3131
srcs = ["DummyGenerator.scala"],
3232
deps = [
3333
"@com_google_protobuf//:protobuf_java",
34+
"@scala_proto_rules_protoc_bridge"
3435
],
3536
)
3637

3738
declare_deps_provider(
3839
name = "scalapb_worker_deps_provider",
3940
deps_id = "scalapb_worker_deps",
40-
deps = [
41-
":DummyGenerator",
42-
"@com_google_protobuf//:protobuf_java",
43-
],
41+
deps = [":DummyGenerator"],
4442
)
4543

4644
scala_proto_deps_toolchain(
@@ -70,15 +68,16 @@ toolchain(
7068
scala_library(
7169
name = "FailingGenerator",
7270
srcs = ["FailingGenerator.scala"],
71+
deps = [
72+
"@com_google_protobuf//:protobuf_java",
73+
"@scala_proto_rules_protoc_bridge"
74+
],
7375
)
7476

7577
declare_deps_provider(
7678
name = "failing_scalapb_worker_deps_provider",
7779
deps_id = "scalapb_worker_deps",
78-
deps = [
79-
":FailingGenerator",
80-
"@com_google_protobuf//:protobuf_java",
81-
],
80+
deps = [":FailingGenerator"],
8281
)
8382

8483
scala_proto_deps_toolchain(

0 commit comments

Comments
 (0)