[bazel-buildtools] Use latest released version (bazel-contrib#1065)

Author: or-shachar

WORKSPACE

@@ -4,11 +4,13 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
 
+_build_tools_release = "3.3.0"
+
 http_archive(
     name = "com_github_bazelbuild_buildtools",
-    sha256 = "cdaac537b56375f658179ee2f27813cac19542443f4722b6730d84e4125355e6",
-    strip_prefix = "buildtools-f27d1753c8b3210d9e87cdc9c45bc2739ae2c2db",
-    url = "https://github.com/bazelbuild/buildtools/archive/f27d1753c8b3210d9e87cdc9c45bc2739ae2c2db.zip",
+    sha256 = "f11fc80da0681a6d64632a850346ed2d4e5cbb0908306d9a2a2915f707048a10",
+    strip_prefix = "buildtools-%s" % _build_tools_release,
+    url = "https://github.com/bazelbuild/buildtools/archive/%s.tar.gz" % _build_tools_release,
 )
 
 load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
@@ -249,11 +251,13 @@ scala_maven_import_external(
     server_urls = MAVEN_SERVER_URLS,
 )
 
-maven_jar(
+scala_maven_import_external(
     name = "com_illicitonion_scalac_composite_reporter",
     artifact = scala_mvn_artifact(
         "com.illicitonion:scalac-composite-reporter:0.0.1",
         default_scala_major_version(),
     ),
-    sha256 = "9e3655fa282adbc6686805d9a745131f18819a15402b20d08fb39253f3b5a5aa",
+    artifact_sha256 = "9e3655fa282adbc6686805d9a745131f18819a15402b20d08fb39253f3b5a5aa",
+    licenses = ["notice"],
+    server_urls = MAVEN_SERVER_URLS,
 )

src/java/io/bazel/rulesscala/scalac/BUILD

@@ -20,15 +20,13 @@ java_binary(
     main_class = "io.bazel.rulesscala.scalac.ScalacWorker",
     visibility = ["//visibility:public"],
     deps = [
-        ":exported_scalac_repositories_from_toolchain_to_jvm",
+       ":exported_scalac_repositories_from_toolchain_to_jvm",
         "@com_illicitonion_scalac_composite_reporter//jar",
-        "@io_bazel_rules_scala//src/java/com/google/devtools/build/lib:worker",
+        "//external:io_bazel_rules_scala/dependency/commons_io/commons_io",
         "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
         "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar",
         "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker",
         "@io_bazel_rules_scala//src/protobuf/io/bazel/rules_scala:diagnostics_java_proto",
-        "@scalac_rules_commons_io//jar",
-        "//external:io_bazel_rules_scala/dependency/commons_io/commons_io",
     ],
 )