Make the scala_protobuf aspect based (bazel-contrib#700)

* Run a test with custom javabin

* Respect java bin overrides

* Try set a different variable

* The action_should_fail tests have been broken :( , without assigning the results of the stdout of calling bazel to a variable, bash will try execute it. So the response code here will always have been on the next line -1

* Empty commit to trigger travis

* Make the scala_protobuf aspect based

* Use default toolchain?

* Remove print

* Remove prints

* Remove println

* Import files

* Default produce services code

* Support dependencies on scala

* Add support for blacklisted protos

* Remove references to with_java

* Provider

* Code generator to toolchain

* Move the configuration options to the toolchain and add a comment

* Remove unused code

* Remove unused code, and get the classpath for compiling to not be the transitive compile time one

* Remove unused extra generator code for now

* Using new bazel this works

* Use the google protoc

* Add the override generator piping

* Show target overriding with a custom code generator

* Add 0.23 travis builds

* Some cleanup

* remove duplicated lines

* Remove older targets from travis since they fail, update readme with advice

* Review comments

* Remove override generator paths

Author: ianoc-stripe

.travis.yml

@@ -19,11 +19,9 @@ env:
   # See https://github.com/bazelbuild/rules_scala/pull/622
   # we want to test the last release
   #- V=0.16.1 TEST_SCRIPT=test_lint.sh
-  - V=0.17.1 TEST_SCRIPT=test_rules_scala.sh
-  - V=0.22.0 TEST_SCRIPT=test_rules_scala.sh
+  - V=0.23.1 TEST_SCRIPT=test_rules_scala.sh
     #- V=0.14.1 TEST_SCRIPT=test_intellij_aspect.sh
-  - V=0.17.1 TEST_SCRIPT=test_reproducibility.sh
-  - V=0.22.0 TEST_SCRIPT=test_reproducibility.sh
+  - V=0.23.1 TEST_SCRIPT=test_reproducibility.sh
 
 before_install:
   - |

README.md

@@ -83,9 +83,11 @@ for an example workspace using another scala version.
 
 ## Bazel compatible versions
 
-| bazel | rules_scala gitsha |
-|-------|--------------------|
-| 0.16.x | HEAD              |
+| bazel  | rules_scala gitsha |
+|--------|--------------------|
+| 0.23.x | HEAD                                     |
+| 0.22.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 |
+| 0.16.x | f3113fb6e9e35cb8f441d2305542026d98afc0a2 |
 | 0.15.x | 3b9ab9be31ac217d3337c709cb6bfeb89c8dcbb1 |
 | 0.14.x | 3b9ab9be31ac217d3337c709cb6bfeb89c8dcbb1 |
 | 0.13.x | 3c987b6ae8a453886759b132f1572c0efca2eca2 |

WORKSPACE

@@ -114,6 +114,10 @@ load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_unused_deps_
 
 scala_register_unused_deps_toolchains()
 
+
+register_toolchains("@io_bazel_rules_scala//test/proto:scalapb_toolchain")
+
+
 load("//scala:scala_maven_import_external.bzl", "scala_maven_import_external", "java_import_external")
 
 scala_maven_import_external(

scala_proto/BUILD

@@ -0,0 +1,38 @@
+load("//scala_proto:scala_proto_toolchain.bzl", "scala_proto_toolchain")
+
+toolchain_type(
+    name = "toolchain_type",
+    visibility = ["//visibility:public"],
+)
+
+scala_proto_toolchain(
+    name = "default_toolchain_impl",
+    with_grpc = True,
+    with_flat_package=False,
+    with_single_line_to_string=False,
+    visibility = ["//visibility:public"],
+)
+
+toolchain(
+    name = "default_toolchain",
+    toolchain = ":default_toolchain_impl",
+    toolchain_type = "@io_bazel_rules_scala//scala_proto:toolchain_type",
+    visibility = ["//visibility:public"],
+)
+
+
+scala_proto_toolchain(
+    name = "enable_all_options_toolchain_impl",
+    with_grpc = True,
+    with_flat_package=True,
+    # with_java=True,
+    with_single_line_to_string=True,
+    visibility = ["//visibility:public"],
+)
+
+toolchain(
+    name = "enable_all_options_toolchain",
+    toolchain = ":enable_all_options_toolchain_impl",
+    toolchain_type = "@io_bazel_rules_scala//scala_proto:toolchain_type",
+    visibility = ["//visibility:public"],
+)

scala_proto/private/BUILD

@@ -0,0 +1,31 @@
+
+SCALAPB_DEPS = [
+    "//external:io_bazel_rules_scala/dependency/proto/scalapb_runtime",
+    "//external:io_bazel_rules_scala/dependency/com_google_protobuf/protobuf_java",
+    "//external:io_bazel_rules_scala/dependency/proto/scalapb_lenses",
+    "//external:io_bazel_rules_scala/dependency/proto/scalapb_fastparse",
+]
+
+GRPC_DEPS = [
+    "//external:io_bazel_rules_scala/dependency/proto/scalapb_runtime_grpc",
+    "//external:io_bazel_rules_scala/dependency/proto/grpc_core",
+    "//external:io_bazel_rules_scala/dependency/proto/grpc_stub",
+    "//external:io_bazel_rules_scala/dependency/proto/grpc_protobuf",
+    "//external:io_bazel_rules_scala/dependency/proto/grpc_netty",
+    "//external:io_bazel_rules_scala/dependency/proto/grpc_context",
+    "//external:io_bazel_rules_scala/dependency/proto/guava",
+    "//external:io_bazel_rules_scala/dependency/proto/opencensus_api",
+    "//external:io_bazel_rules_scala/dependency/proto/opencensus_contrib_grpc_metrics",
+    "//external:io_bazel_rules_scala/dependency/proto/google_instrumentation",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_codec",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_codec_http",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_codec_http2",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_codec_socks",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_handler",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_buffer",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_transport",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_resolver",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_common",
+    "//external:io_bazel_rules_scala/dependency/proto/netty_handler_proxy",
+]
+

scala_proto/private/dep_sets.bzl

@@ -0,0 +1,49 @@
+load(
+    "//scala/private:common.bzl",
+    "write_manifest_file",
+)
+load("//scala/private:rule_impls.bzl", "compile_scala")
+load("//scala_proto/private:dep_sets.bzl", "SCALAPB_DEPS", "GRPC_DEPS")
+
+
+def _root_path(f):
+    if f.is_source:
+        return f.owner.workspace_root
+    return "/".join([f.root.path, f.owner.workspace_root])
+
+
+def _colon_paths(data):
+    return ":".join([
+        f.path
+        for f in sorted(data)
+    ])
+
+
+def proto_to_scala_src(ctx, label, code_generator, compile_proto, include_proto, transitive_proto_paths, flags, jar_output):
+    worker_content = "{output}\n{included_proto}\n{flags_arg}\n{transitive_proto_paths}\n{inputs}\n{protoc}".format(
+        output = jar_output.path,
+        included_proto = "-" + ":".join(sorted(["%s,%s" % (f.root.path, f.path) for f in include_proto])),
+        # Command line args to worker cannot be empty so using padding
+        flags_arg = "-" + ",".join(flags),
+        transitive_proto_paths = "-" + ":".join(sorted(transitive_proto_paths)),
+        # Command line args to worker cannot be empty so using padding
+        # Pass inputs seprately because they doesn't always match to imports (ie blacklisted protos are excluded)
+        inputs = _colon_paths(compile_proto),
+        protoc = ctx.executable._protoc.path
+    )
+    argfile = ctx.actions.declare_file(
+        "%s_worker_input" % label.name,
+        sibling = jar_output,
+    )
+    ctx.actions.write(output = argfile, content = worker_content)
+    ctx.actions.run(
+        executable = code_generator.files_to_run,
+        inputs = compile_proto + include_proto + [argfile, ctx.executable._protoc],
+        outputs = [jar_output],
+        mnemonic = "ProtoScalaPBRule",
+        progress_message = "creating scalapb files %s" % ctx.label,
+        execution_requirements = {"supports-workers": "1"},
+        arguments = ["@" + argfile.path],
+    )
+
+