Revert "Make the scala_protobuf aspect based (bazelbuild#700)"

This reverts commit 74192b2.

.travis.yml

@@ -19,9 +19,11 @@ 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.23.1 TEST_SCRIPT=test_rules_scala.sh
+  - V=0.17.1 TEST_SCRIPT=test_rules_scala.sh
+  - V=0.22.0 TEST_SCRIPT=test_rules_scala.sh
     #- V=0.14.1 TEST_SCRIPT=test_intellij_aspect.sh
-  - V=0.23.1 TEST_SCRIPT=test_reproducibility.sh
+  - V=0.17.1 TEST_SCRIPT=test_reproducibility.sh
+  - V=0.22.0 TEST_SCRIPT=test_reproducibility.sh
 
 before_install:
   - |

README.md

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

WORKSPACE

@@ -121,10 +121,6 @@ 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

@@ -1,38 +0,0 @@
-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"],
-)