Make rules_jvm_external a dev dependency

4 files changed, 20 insertions, 31 deletions

diff --git a/BUILD.bazel b/BUILD.bazel
index ebd0f993..4fb87d0c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,6 +1,8 @@
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "define_kt_toolchain")
 load("@io_bazel_rules_kotlin//kotlin/internal:opts.bzl", "kt_javac_options", "kt_kotlinc_options")
+load("@rules_jvm_external//:defs.bzl", "java_export")
+load("//:maven.bzl", "JAZZER_API_COORDINATES")
 
 exports_files(["LICENSE"])
 
@@ -57,13 +59,6 @@ exports_files([
     "jazzer-api.pom",
 ])
 
-# To publish a new release to Maven, run:
-# bazel run --config=maven --define "maven_user=..." --define "maven_password=..." --define gpg_sign=true //:jazzer-api.publish
-alias(
-    name = "jazzer-api.publish",
-    actual = "//agent/src/main/java/com/code_intelligence/jazzer/api:api_export.publish",
-)
-
 config_setting(
     name = "clang",
     flag_values = {"@bazel_tools//tools/cpp:compiler": "clang"},
@@ -86,3 +81,14 @@ platform(
         "@bazel_tools//tools/cpp:clang-cl",
     ],
 )
+
+# To publish a new release of the Jazzer API to Maven, run:
+# bazel run --config=maven --define "maven_user=..." --define "maven_password=..." --define gpg_sign=true //:api.publish
+# Build //:api-docs.jar to generate javadocs for the API.
+java_export(
+    name = "api",
+    maven_coordinates = JAZZER_API_COORDINATES,
+    pom_template = "//:jazzer-api.pom",
+    visibility = ["//visibility:public"],
+    runtime_deps = ["//agent/src/main/java/com/code_intelligence/jazzer/api"],
+)
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index 51d8f8c6..07c46d0a 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -51,6 +51,13 @@ http_archive(
 )
 
 http_archive(
+    name = "rules_jvm_external",
+    sha256 = "f36441aa876c4f6427bfb2d1f2d723b48e9d930b62662bf723ddfb8fc80f0140",
+    strip_prefix = "rules_jvm_external-4.1",
+    url = "https://github.com/bazelbuild/rules_jvm_external/archive/4.1.zip",
+)
+
+http_archive(
     name = "libjpeg_turbo",
     build_file = "//third_party:libjpeg_turbo.BUILD",
     sha256 = "6a965adb02ad898b2ae48214244618fe342baea79db97157fdc70d8844ac6f09",
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/api/BUILD.bazel b/agent/src/main/java/com/code_intelligence/jazzer/api/BUILD.bazel
index b8244fb0..dfa555c6 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/api/BUILD.bazel
+++ b/agent/src/main/java/com/code_intelligence/jazzer/api/BUILD.bazel
@@ -1,21 +1,5 @@
-load("@rules_jvm_external//:defs.bzl", "javadoc", "java_export")
-load("//:maven.bzl", "JAZZER_API_COORDINATES")
-
 java_library(
     name = "api",
     srcs = glob(["*.java"]),
     visibility = ["//visibility:public"],
 )
-
-javadoc(
-    name = "api_javadoc",
-    deps = [":api"],
-)
-
-java_export(
-    name = "api_export",
-    srcs = glob(["*.java"]),
-    maven_coordinates = JAZZER_API_COORDINATES,
-    pom_template = "//:jazzer-api.pom",
-    visibility = ["//visibility:public"],
-)
diff --git a/repositories.bzl b/repositories.bzl
index f65063fc..1edf79ce 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -41,14 +41,6 @@ def jazzer_dependencies():
 
     maybe(
         http_archive,
-        name = "rules_jvm_external",
-        sha256 = "f36441aa876c4f6427bfb2d1f2d723b48e9d930b62662bf723ddfb8fc80f0140",
-        strip_prefix = "rules_jvm_external-4.1",
-        url = "https://github.com/bazelbuild/rules_jvm_external/archive/4.1.zip",
-    )
-
-    maybe(
-        http_archive,
         name = "io_bazel_rules_kotlin",
         sha256 = "6cbd4e5768bdfae1598662e40272729ec9ece8b7bded8f0d2c81c8ff96dc139d",
         url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.5.0-beta-4/rules_kotlin_release.tgz",