Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@fmeum
fmeum committed Apr 27, 2023
1 parent 505677f commit eb87fd4
Show file tree
Hide file tree
Showing 8 changed files with 256 additions and 24 deletions.
Empty file added .bazelversion
View file
Empty file.
51 changes: 45 additions & 6 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
# Needed for generating the Stardoc release binary.
git_repository(
name = "io_bazel",
commit = "5100f179e64b81c396b5a40627c591d8e4fd8a5d",
patches = ["@//:bazel.patch"], # TODO: Remove after next bazel update
commit = "c6a8c0827061697fa8fa9dd21310b276d9887e8c", # 2023-04-27
remote = "https://github.com/bazelbuild/bazel.git",
)

Expand All @@ -35,6 +34,46 @@ bind(
actual = "@io_bazel//third_party:error_prone_annotations",
)

RULES_JVM_EXTERNAL_TAG = "4.5"
RULES_JVM_EXTERNAL_SHA ="b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6"

http_archive(
name = "rules_jvm_external",
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
sha256 = RULES_JVM_EXTERNAL_SHA,
url = "https://github.com/bazelbuild/rules_jvm_external/archive/refs/tags/%s.zip" % RULES_JVM_EXTERNAL_TAG,
)

load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")

rules_jvm_external_deps()

load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")

rules_jvm_external_setup()

load("@rules_jvm_external//:defs.bzl", "maven_install")
load("@rules_jvm_external//:specs.bzl", "maven")

maven_install(
artifacts = [
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
"com.google.code.gson:gson:2.9.0",
"com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:guava:31.1-jre",
],
fail_if_repin_required = True,
maven_install_json = "//:maven_install.json",
repositories = [
"https://repo1.maven.org/maven2",
],
strict_visibility = True,
)

load("@maven//:defs.bzl", "pinned_maven_install")

pinned_maven_install()

# Needed only because of java_tools.
http_archive(
name = "rules_cc",
Expand All @@ -47,11 +86,11 @@ http_archive(
)

# Needed as a transitive dependency of @io_bazel
git_repository(
http_archive(
name = "rules_python",
commit = "4b84ad270387a7c439ebdccfd530e2339601ef27",
remote = "https://github.com/bazelbuild/rules_python.git",
shallow_since = "1564776078 -0400",
sha256 = "a644da969b6824cc87f8fe7b18101a8a6c57da5db39caa6566ec6109f37d2141",
strip_prefix = "rules_python-0.20.0",
urls = ["https://github.com/bazelbuild/rules_python/releases/download/0.20.0/rules_python-0.20.0.tar.gz"],
)

# Needed for //distro:__pkg__ and as a transitive dependency of @io_bazel
Expand Down
14 changes: 0 additions & 14 deletions bazel.patch
View file

This file was deleted.

205 changes: 205 additions & 0 deletions maven_install.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -1096152525,
"__RESOLVED_ARTIFACTS_HASH": 949429606,
"conflict_resolution": {},
"dependencies": [
{
"coord": "com.github.stephenc.jcip:jcip-annotations:1.0-1",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1.jar"
],
"packages": [
"net.jcip.annotations"
],
"sha256": "4fccff8382aafc589962c4edb262f6aa595e34f1e11e61057d1c6a96e8fc7323",
"url": "https://repo1.maven.org/maven2/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1.jar"
},
{
"coord": "com.google.code.findbugs:jsr305:3.0.2",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
],
"packages": [
"javax.annotation",
"javax.annotation.concurrent",
"javax.annotation.meta"
],
"sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
"url": "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
},
{
"coord": "com.google.code.gson:gson:2.9.0",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar"
],
"packages": [
"com.google.gson",
"com.google.gson.annotations",
"com.google.gson.internal",
"com.google.gson.internal.bind",
"com.google.gson.internal.bind.util",
"com.google.gson.internal.reflect",
"com.google.gson.internal.sql",
"com.google.gson.reflect",
"com.google.gson.stream"
],
"sha256": "c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d",
"url": "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar"
},
{
"coord": "com.google.errorprone:error_prone_annotations:2.18.0",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar"
],
"packages": [
"com.google.errorprone.annotations",
"com.google.errorprone.annotations.concurrent"
],
"sha256": "9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae",
"url": "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar"
},
{
"coord": "com.google.guava:failureaccess:1.0.1",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
],
"packages": [
"com.google.common.util.concurrent.internal"
],
"sha256": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26",
"url": "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
},
{
"coord": "com.google.guava:guava:31.1-jre",
"dependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:failureaccess:1.0.1",
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
"com.google.j2objc:j2objc-annotations:1.3",
"org.checkerframework:checker-qual:3.12.0"
],
"directDependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:failureaccess:1.0.1",
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
"com.google.j2objc:j2objc-annotations:1.3",
"org.checkerframework:checker-qual:3.12.0"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar"
],
"packages": [
"com.google.common.annotations",
"com.google.common.base",
"com.google.common.base.internal",
"com.google.common.cache",
"com.google.common.collect",
"com.google.common.escape",
"com.google.common.eventbus",
"com.google.common.graph",
"com.google.common.hash",
"com.google.common.html",
"com.google.common.io",
"com.google.common.math",
"com.google.common.net",
"com.google.common.primitives",
"com.google.common.reflect",
"com.google.common.util.concurrent",
"com.google.common.xml",
"com.google.thirdparty.publicsuffix"
],
"sha256": "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab",
"url": "https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar"
},
{
"coord": "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
],
"packages": [],
"sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99",
"url": "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
},
{
"coord": "com.google.j2objc:j2objc-annotations:1.3",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
],
"packages": [
"com.google.j2objc.annotations"
],
"sha256": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
"url": "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
},
{
"coord": "org.checkerframework:checker-qual:3.12.0",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar"
],
"packages": [
"org.checkerframework.checker.builder.qual",
"org.checkerframework.checker.calledmethods.qual",
"org.checkerframework.checker.compilermsgs.qual",
"org.checkerframework.checker.fenum.qual",
"org.checkerframework.checker.formatter.qual",
"org.checkerframework.checker.guieffect.qual",
"org.checkerframework.checker.i18n.qual",
"org.checkerframework.checker.i18nformatter.qual",
"org.checkerframework.checker.index.qual",
"org.checkerframework.checker.initialization.qual",
"org.checkerframework.checker.interning.qual",
"org.checkerframework.checker.lock.qual",
"org.checkerframework.checker.nullness.qual",
"org.checkerframework.checker.optional.qual",
"org.checkerframework.checker.propkey.qual",
"org.checkerframework.checker.regex.qual",
"org.checkerframework.checker.signature.qual",
"org.checkerframework.checker.signedness.qual",
"org.checkerframework.checker.tainting.qual",
"org.checkerframework.checker.units.qual",
"org.checkerframework.common.aliasing.qual",
"org.checkerframework.common.initializedfields.qual",
"org.checkerframework.common.reflection.qual",
"org.checkerframework.common.returnsreceiver.qual",
"org.checkerframework.common.subtyping.qual",
"org.checkerframework.common.util.report.qual",
"org.checkerframework.common.value.qual",
"org.checkerframework.dataflow.qual",
"org.checkerframework.framework.qual"
],
"sha256": "ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb",
"url": "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar"
}
],
"version": "0.1.0"
}
}
7 changes: 4 additions & 3 deletions setup.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ def stardoc_repositories():
_include_if_not_defined(
http_archive,
name = "rules_license",
# TODO: Bazel@HEAD fails in the analysis phase with rules_license 0.0.4.
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz",
"https://github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz",
"https://github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz",
],
sha256 = "6157e1e68378532d0241ecd15d3c45f6e5cfd98fc10846045509fb2a7cc9e381",
sha256 = "00ccc0df21312c127ac4b12880ab0f9a26c1cff99442dc6c5a331750360de3c3",
)
1 change: 0 additions & 1 deletion stardoc/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ bzl_library(
visibility = ["//visibility:public"],
deps = [
"//stardoc/private:stardoc_lib",
"@bazel_skylib//:bzl_library",
"@rules_java//java:rules",
],
)
Expand Down
0 stardoc/private/BUILD.bazel → stardoc/private/BUILD
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions stardoc/stardoc.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,15 @@ def stardoc(

stardoc_with_runfiles_name = name + "_stardoc"

testonly = {"testonly": kwargs["testonly"]} if "testonly" in kwargs else {}
java_binary(
name = stardoc_with_runfiles_name,
main_class = "com.google.devtools.build.skydoc.SkydocMain",
runtime_deps = [stardoc],
data = [input] + deps,
tags = ["manual"],
visibility = ["//visibility:private"],
**testonly
)

_stardoc(
Expand Down

0 comments on commit eb87fd4

Please sign in to comment.