Skip to content

Commit 439ce4a

Browse files
authored
scala example: no longer specify 'grpc' option statically (#290)
The plugin for scala adds "grpc" into the options based on if there are services present, and no longer needs to be specified in the config like this. This change fixes 'bazel run //:gazelle` for the examples.
1 parent 2f775e2 commit 439ce4a

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
build:bazelci --deleted_packages=docs
2+
# workaround for scala
3+
build --incompatible_java_common_parameters=false

example/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545

4646
## Scala ##
4747
# gazelle:proto_plugin scala implementation scalapb:scalapb:protoc-gen-scala
48-
# gazelle:proto_plugin scala option grpc
4948
# gazelle:proto_plugin scala deps @com_google_protobuf//:protobuf_java
5049
# gazelle:proto_plugin scala deps @maven_scala//:com_thesamet_scalapb_lenses_2_12
5150
# gazelle:proto_plugin scala deps @maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12

example/routeguide/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ grpc_scala_library(
282282

283283
proto_compile(
284284
name = "routeguide_scala_compile",
285-
options = {"@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala": ["grpc"]},
286285
outputs = [
287286
"routeguide_scala.srcjar",
288287
"routeguide_akka_grpc.srcjar",

0 commit comments

Comments
 (0)