Consume JaCoCo via jvm_import_external

Author: guw

MODULE.bazel

@@ -58,22 +58,17 @@ use_repo(maven, "maven")
 #
 # Get the matching bazel jacoco jars from https://github.com/bazelbuild/bazel/tree/master/third_party/java/jacoco
 #
-http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+jvm_import_external = use_repo_rule("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_import_external")
 
-http_archive(
-    name = "bazel_org_jacoco_core_jar",
-    downloaded_file_path = "org.jacoco.core.jar",
-    sha256 = "fcd188c688473fc8dcc0c6caaf355e7b389502243527c33b9597a3ec28791f47",
-    urls = [
+jvm_import_external(
+    name = "bazel_org_jacoco_core",
+    rule_name = "java_import",
+    artifact_sha256 = "fcd188c688473fc8dcc0c6caaf355e7b389502243527c33b9597a3ec28791f47",
+    artifact_urls = [
         "https://github.com/bazelbuild/bazel/raw/ad8ea5aed2c97c4dbbe577fb69adbd51746f6a51/third_party/java/jacoco/org.jacoco.core-0.8.11.jar",
     ],
-)
-
-http_archive(
-    name = "bazel_org_jacoco_core_srcjar",
-    downloaded_file_path = "org.jacoco.core-sources.jar",
-    sha256 = "6856d98a837c669f33284df0104130000b12eaf38f04374c6d753eb03c65d93a",
-    urls = [
+    srcjar_sha256 = "6856d98a837c669f33284df0104130000b12eaf38f04374c6d753eb03c65d93a",
+    srcjar_urls = [
         "https://github.com/bazelbuild/bazel/raw/ad8ea5aed2c97c4dbbe577fb69adbd51746f6a51/third_party/java/jacoco/org.jacoco.core-0.8.11-sources.jar",
     ],
 )

compiler/BUILD

@@ -15,12 +15,6 @@ java_library(
 
 # Bazel's BuildJar
 
-java_import(
-    name = "bazel_org_jacoco_core",
-    jars = ["@bazel_org_jacoco_core_jar//file"],
-    srcjar = "@bazel_org_jacoco_core_srcjar//file",
-)
-
 java_library(
     name = "buildjar",
     srcs = glob(["src/main/buildjar/**/*.java"]),
@@ -41,7 +35,7 @@ java_library(
         "@maven//:org_ow2_asm_asm_util",
     ],
     deps = [
-        ":bazel_org_jacoco_core",
+        "@bazel_org_jacoco_core//jar",
         ":ecj",
         ":work_request_handlers",
         "//compiler/src/main/protobuf:deps_java_proto",