Update scala examples (#293)

* Add updated scala config
* Reset example scala rules
* Update config and regenerate
* Add back static grpc option
* Fix deps for client/server

Author: pcj

example/BUILD.bazel

@@ -44,29 +44,37 @@
 # gazelle:proto_language java rule grpc_java_library
 
 ## Scala ##
-# gazelle:proto_plugin scala implementation scalapb:scalapb:protoc-gen-scala
-# gazelle:proto_plugin scala deps @com_google_protobuf//:protobuf_java
-# gazelle:proto_plugin scala deps @maven_scala//:com_thesamet_scalapb_lenses_2_12
-# gazelle:proto_plugin scala deps @maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12
-# gazelle:proto_plugin scala deps @maven_scala//:com_thesamet_scalapb_scalapb_runtime_grpc_2_12
-# gazelle:proto_plugin scala deps @maven_scala//:io_grpc_grpc_api
-# gazelle:proto_plugin scala deps @maven_scala//:io_grpc_grpc_stub
-# gazelle:proto_plugin scala deps @maven_scala//:io_grpc_grpc_protobuf
-
-# gazelle:proto_plugin akka-grpc implementation akka:akka-grpc:protoc-gen-akka-grpc
-# gazelle:proto_plugin akka-grpc deps @maven_akka//:com_lightbend_akka_grpc_akka_grpc_runtime_2_12
-# gazelle:proto_plugin akka-grpc deps @maven_akka//:com_typesafe_akka_akka_actor_2_12
-# gazelle:proto_plugin akka-grpc deps @maven_akka//:com_typesafe_akka_akka_http_core_2_12
-# gazelle:proto_plugin akka-grpc deps @maven_akka//:com_typesafe_akka_akka_stream_2_12
+# gazelle:proto_plugin protoc-gen-scala implementation scalapb:scalapb:protoc-gen-scala
+# gazelle:proto_plugin protoc-gen-scala-grpc implementation scalapb:scalapb:protoc-gen-scala
+# gazelle:proto_plugin protoc-gen-scala-grpc label @build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala-grpc
+# gazelle:proto_plugin protoc-gen-scala-grpc option grpc
+# gazelle:proto_plugin protoc-gen-akka-grpc implementation akka:akka-grpc:protoc-gen-akka-grpc
 
 # gazelle:proto_rule proto_scala_library implementation stackb:rules_proto:proto_scala_library
+# gazelle:proto_rule proto_scala_library option --plugins=protoc-gen-scala
+# gazelle:proto_rule proto_scala_library deps @maven_scala//:com_google_protobuf_protobuf_java
+# gazelle:proto_rule proto_scala_library deps @maven_scala//:com_thesamet_scalapb_lenses_2_12
+# gazelle:proto_rule proto_scala_library deps @maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12
 # gazelle:proto_rule proto_scala_library visibility //visibility:public
 
 # gazelle:proto_rule grpc_scala_library implementation stackb:rules_proto:grpc_scala_library
+# gazelle:proto_rule grpc_scala_library option --plugins=protoc-gen-scala-grpc,protoc-gen-akka-grpc
+# gazelle:proto_rule grpc_scala_library deps @maven_scala//:com_google_protobuf_protobuf_java
+# gazelle:proto_rule grpc_scala_library deps @maven_scala//:com_thesamet_scalapb_lenses_2_12
+# gazelle:proto_rule grpc_scala_library deps @maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12
+# gazelle:proto_rule grpc_scala_library deps @maven_scala//:com_thesamet_scalapb_scalapb_runtime_grpc_2_12
+# gazelle:proto_rule grpc_scala_library deps @maven_akka//:com_lightbend_akka_grpc_akka_grpc_runtime_2_12_2_1_3
+# gazelle:proto_rule grpc_scala_library deps @maven_akka//:com_typesafe_akka_akka_actor_2_12
+# gazelle:proto_rule grpc_scala_library deps @maven_akka//:com_typesafe_akka_akka_http_core_2_12
+# gazelle:proto_rule grpc_scala_library deps @maven_akka//:com_typesafe_akka_akka_stream_2_12
+# gazelle:proto_rule grpc_scala_library deps @maven_scala//:io_grpc_grpc_api
+# gazelle:proto_rule grpc_scala_library deps @maven_scala//:io_grpc_grpc_protobuf
+# gazelle:proto_rule grpc_scala_library deps @maven_scala//:io_grpc_grpc_stub
 # gazelle:proto_rule grpc_scala_library visibility //visibility:public
 
-# gazelle:proto_language scala plugin scala
-# gazelle:proto_language scala plugin akka-grpc
+# gazelle:proto_language scala plugin protoc-gen-scala
+# gazelle:proto_language scala plugin protoc-gen-scala-grpc
+# gazelle:proto_language scala plugin protoc-gen-akka-grpc
 # gazelle:proto_language scala rule proto_compile
 # gazelle:proto_language scala rule proto_scala_library
 # gazelle:proto_language scala rule grpc_scala_library

example/person/BUILD.bazel

@@ -1,11 +1,11 @@
+load("@build_stack_rules_proto//rules/scala:proto_scala_library.bzl", "proto_scala_library")
 load("@build_stack_rules_proto//rules/ts:proto_ts_library.bzl", "proto_ts_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@build_stack_rules_proto//rules/cc:proto_cc_library.bzl", "proto_cc_library")
 load("@build_stack_rules_proto//rules/closure:proto_closure_js_library.bzl", "proto_closure_js_library")
 load("@build_stack_rules_proto//rules/java:proto_java_library.bzl", "proto_java_library")
 load("@build_stack_rules_proto//rules/nodejs:proto_nodejs_library.bzl", "proto_nodejs_library")
 load("@build_stack_rules_proto//rules/py:proto_py_library.bzl", "proto_py_library")
-load("@build_stack_rules_proto//rules/scala:proto_scala_library.bzl", "proto_scala_library")
 load("@build_stack_rules_proto//rules:proto_compile.bzl", "proto_compile")
 
 proto_library(
@@ -132,29 +132,6 @@ proto_py_library(
     ],
 )
 
-proto_compile(
-    name = "person_scala_compile",
-    outputs = ["person_scala.srcjar"],
-    plugins = ["@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala"],
-    proto = "person_proto",
-)
-
-proto_scala_library(
-    name = "person_scala_library",
-    srcs = ["person_scala.srcjar"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//example/place:place_scala_library",
-        "@com_google_protobuf//:protobuf_java",
-        "@maven_scala//:com_thesamet_scalapb_lenses_2_12",
-        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12",
-        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_grpc_2_12",
-        "@maven_scala//:io_grpc_grpc_api",
-        "@maven_scala//:io_grpc_grpc_protobuf",
-        "@maven_scala//:io_grpc_grpc_stub",
-    ],
-)
-
 proto_compile(
     name = "person_ts_proto_compile",
     options = {"@build_stack_rules_proto//plugin/stephenh/ts-proto:protoc-gen-ts-proto": [
@@ -179,3 +156,29 @@ proto_ts_library(
         "@npm_tsc//protobufjs",
     ],
 )
+
+proto_compile(
+    name = "person_scala_compile",
+    options = {"@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala-grpc": ["grpc"]},
+    outputs = [
+        "person_scala.srcjar",
+        "person_scala_grpc.srcjar",
+    ],
+    plugins = [
+        "@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala",
+        "@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala-grpc",
+    ],
+    proto = "person_proto",
+)
+
+proto_scala_library(
+    name = "person_proto_scala_library",
+    srcs = ["person_scala.srcjar"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//example/place:place_proto_scala_library",
+        "@maven_scala//:com_google_protobuf_protobuf_java",
+        "@maven_scala//:com_thesamet_scalapb_lenses_2_12",
+        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12",
+    ],
+)

example/place/BUILD.bazel

@@ -1,11 +1,11 @@
+load("@build_stack_rules_proto//rules/scala:proto_scala_library.bzl", "proto_scala_library")
 load("@build_stack_rules_proto//rules/ts:proto_ts_library.bzl", "proto_ts_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@build_stack_rules_proto//rules/cc:proto_cc_library.bzl", "proto_cc_library")
 load("@build_stack_rules_proto//rules/closure:proto_closure_js_library.bzl", "proto_closure_js_library")
 load("@build_stack_rules_proto//rules/java:proto_java_library.bzl", "proto_java_library")
 load("@build_stack_rules_proto//rules/nodejs:proto_nodejs_library.bzl", "proto_nodejs_library")
 load("@build_stack_rules_proto//rules/py:proto_py_library.bzl", "proto_py_library")
-load("@build_stack_rules_proto//rules/scala:proto_scala_library.bzl", "proto_scala_library")
 load("@build_stack_rules_proto//rules:proto_compile.bzl", "proto_compile")
 
 proto_library(
@@ -131,29 +131,6 @@ proto_py_library(
     ],
 )
 
-proto_compile(
-    name = "place_scala_compile",
-    outputs = ["place_scala.srcjar"],
-    plugins = ["@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala"],
-    proto = "place_proto",
-)
-
-proto_scala_library(
-    name = "place_scala_library",
-    srcs = ["place_scala.srcjar"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//example/thing:thing_scala_library",
-        "@com_google_protobuf//:protobuf_java",
-        "@maven_scala//:com_thesamet_scalapb_lenses_2_12",
-        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12",
-        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_grpc_2_12",
-        "@maven_scala//:io_grpc_grpc_api",
-        "@maven_scala//:io_grpc_grpc_protobuf",
-        "@maven_scala//:io_grpc_grpc_stub",
-    ],
-)
-
 proto_compile(
     name = "place_ts_proto_compile",
     options = {"@build_stack_rules_proto//plugin/stephenh/ts-proto:protoc-gen-ts-proto": [
@@ -178,3 +155,29 @@ proto_ts_library(
         "@npm_tsc//protobufjs",
     ],
 )
+
+proto_compile(
+    name = "place_scala_compile",
+    options = {"@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala-grpc": ["grpc"]},
+    outputs = [
+        "place_scala.srcjar",
+        "place_scala_grpc.srcjar",
+    ],
+    plugins = [
+        "@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala",
+        "@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala-grpc",
+    ],
+    proto = "place_proto",
+)
+
+proto_scala_library(
+    name = "place_proto_scala_library",
+    srcs = ["place_scala.srcjar"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//example/thing:thing_proto_scala_library",
+        "@maven_scala//:com_google_protobuf_protobuf_java",
+        "@maven_scala//:com_thesamet_scalapb_lenses_2_12",
+        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12",
+    ],
+)

example/routeguide/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@build_stack_rules_proto//rules/scala:grpc_scala_library.bzl", "grpc_scala_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@build_stack_rules_proto//rules/cc:grpc_cc_library.bzl", "grpc_cc_library")
 load("@build_stack_rules_proto//rules/cc:proto_cc_library.bzl", "proto_cc_library")
@@ -11,7 +12,6 @@ load("@build_stack_rules_proto//rules/nodejs:grpc_web_js_library.bzl", "grpc_web
 load("@build_stack_rules_proto//rules/nodejs:proto_nodejs_library.bzl", "proto_nodejs_library")
 load("@build_stack_rules_proto//rules/py:grpc_py_library.bzl", "grpc_py_library")
 load("@build_stack_rules_proto//rules/py:proto_py_library.bzl", "proto_py_library")
-load("@build_stack_rules_proto//rules/scala:grpc_scala_library.bzl", "grpc_scala_library")
 load("@build_stack_rules_proto//rules/ts:proto_ts_library.bzl", "proto_ts_library")
 load("@build_stack_rules_proto//rules:proto_compile.bzl", "proto_compile")
 
@@ -258,19 +258,45 @@ proto_py_library(
     deps = ["@com_google_protobuf//:protobuf_python"],
 )
 
+proto_compile(
+    name = "routeguide_ts_proto_compile",
+    options = {"@build_stack_rules_proto//plugin/stephenh/ts-proto:protoc-gen-ts-proto": [
+        "emitImportedFiles=false",
+        "esModuleInterop=true",
+        "nestJs=true",
+    ]},
+    outputs = ["routeguide.ts"],
+    plugins = ["@build_stack_rules_proto//plugin/stephenh/ts-proto:protoc-gen-ts-proto"],
+    proto = "routeguide_proto",
+)
+
+proto_ts_library(
+    name = "routeguide_ts_proto",
+    srcs = ["routeguide.ts"],
+    args = ["--lib ES2015"],
+    tags = ["manual"],
+    tsc = "@npm_tsc//typescript/bin:tsc",
+    visibility = ["//visibility:public"],
+    deps = [
+        "@npm_tsc//@nestjs/microservices",
+        "@npm_tsc//long",
+        "@npm_tsc//protobufjs",
+    ],
+)
+
 grpc_scala_library(
-    name = "routeguide_scala_library",
+    name = "routeguide_grpc_scala_library",
     srcs = [
         "routeguide_akka_grpc.srcjar",
-        "routeguide_scala.srcjar",
+        "routeguide_scala_grpc.srcjar",
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "@com_google_protobuf//:protobuf_java",
-        "@maven_akka//:com_lightbend_akka_grpc_akka_grpc_runtime_2_12",
+        "@maven_akka//:com_lightbend_akka_grpc_akka_grpc_runtime_2_12_2_1_3",
         "@maven_akka//:com_typesafe_akka_akka_actor_2_12",
         "@maven_akka//:com_typesafe_akka_akka_http_core_2_12",
         "@maven_akka//:com_typesafe_akka_akka_stream_2_12",
+        "@maven_scala//:com_google_protobuf_protobuf_java",
         "@maven_scala//:com_thesamet_scalapb_lenses_2_12",
         "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12",
         "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_grpc_2_12",
@@ -282,39 +308,16 @@ grpc_scala_library(
 
 proto_compile(
     name = "routeguide_scala_compile",
+    options = {"@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala-grpc": ["grpc"]},
     outputs = [
-        "routeguide_scala.srcjar",
         "routeguide_akka_grpc.srcjar",
+        "routeguide_scala.srcjar",
+        "routeguide_scala_grpc.srcjar",
     ],
     plugins = [
-        "@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala",
         "@build_stack_rules_proto//plugin/akka/akka-grpc:protoc-gen-akka-grpc",
+        "@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala",
+        "@build_stack_rules_proto//plugin/scalapb/scalapb:protoc-gen-scala-grpc",
     ],
     proto = "routeguide_proto",
 )
-
-proto_compile(
-    name = "routeguide_ts_proto_compile",
-    options = {"@build_stack_rules_proto//plugin/stephenh/ts-proto:protoc-gen-ts-proto": [
-        "emitImportedFiles=false",
-        "esModuleInterop=true",
-        "nestJs=true",
-    ]},
-    outputs = ["routeguide.ts"],
-    plugins = ["@build_stack_rules_proto//plugin/stephenh/ts-proto:protoc-gen-ts-proto"],
-    proto = "routeguide_proto",
-)
-
-proto_ts_library(
-    name = "routeguide_ts_proto",
-    srcs = ["routeguide.ts"],
-    args = ["--lib ES2015"],
-    tags = ["manual"],
-    tsc = "@npm_tsc//typescript/bin:tsc",
-    visibility = ["//visibility:public"],
-    deps = [
-        "@npm_tsc//@nestjs/microservices",
-        "@npm_tsc//long",
-        "@npm_tsc//protobufjs",
-    ],
-)

example/routeguide/scala/BUILD.bazel

@@ -4,18 +4,27 @@ scala_library(
     name = "util",
     srcs = ["RouteGuideUtil.scala"],
     resources = ["//example/routeguide:feature_db"],
-    exports = ["//example/routeguide:routeguide_scala_library"],
     deps = [
-        "//example/routeguide:routeguide_scala_library",
+        "//example/routeguide:routeguide_grpc_scala_library",
+        "@maven_scala//:com_thesamet_scalapb_lenses_2_12",
         "@maven_scala//:com_thesamet_scalapb_scalapb_json4s_2_12_0_12_0",
+        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12",
     ],
 )
 
 scala_binary(
     name = "client",
     srcs = ["RouteGuideClient.scala"],
     main_class = "example.routeguide.scala.RouteGuideClient",
-    deps = [":util"],
+    deps = [
+        ":util",
+        "//example/routeguide:routeguide_grpc_scala_library",
+        "@maven_scala//:com_thesamet_scalapb_lenses_2_12",
+        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12",
+        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_grpc_2_12",
+        "@maven_scala//:io_grpc_grpc_api",
+        "@maven_scala//:io_grpc_grpc_stub",
+    ],
 )
 
 scala_binary(
@@ -26,5 +35,13 @@ scala_binary(
         "RouteGuideService.scala",
     ],
     main_class = "example.routeguide.scala.RouteGuideServer",
-    deps = [":util"],
+    deps = [
+        ":util",
+        "//example/routeguide:routeguide_grpc_scala_library",
+        "@maven_scala//:com_thesamet_scalapb_lenses_2_12",
+        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_2_12",
+        "@maven_scala//:com_thesamet_scalapb_scalapb_runtime_grpc_2_12",
+        "@maven_scala//:io_grpc_grpc_api",
+        "@maven_scala//:io_grpc_grpc_stub",
+    ],
 )