Skip to content

Commit aa067a1

Browse files
committed
bazel: Update rulesets and remove upstreamed patches
1 parent e7b9fd5 commit aa067a1

7 files changed

+15
-739
lines changed

WORKSPACE.bazel

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1313

1414
http_archive(
1515
name = "rules_java",
16-
patch_args = ["-p1"],
17-
patches = [
18-
# https://github.com/bazelbuild/rules_java/pull/114
19-
# Remove unnecessary dependency on a Java runtime for the target platform.
20-
"//third_party:rules_java-use-bootstrap-runtime-toolchain-type.patch",
21-
],
22-
sha256 = "fd1d5538c8e5bbf890e1e31e983139b89710aacd0a5327ddf9afe12090ed9c78",
23-
strip_prefix = "rules_java-ca72739da10036e1d2cf2aaeab78fae87673e43f",
16+
sha256 = "7b0d9ba216c821ee8697dedc0f9d0a705959ace462a3885fe9ba0347ba950111",
2417
urls = [
25-
"https://github.com/bazelbuild/rules_java/archive/ca72739da10036e1d2cf2aaeab78fae87673e43f.tar.gz",
18+
"https://github.com/bazelbuild/rules_java/releases/download/6.5.1/rules_java-6.5.1.tar.gz",
2619
],
2720
)
2821

@@ -94,14 +87,9 @@ http_archive(
9487

9588
http_archive(
9689
name = "contrib_rules_jvm",
97-
patch_args = ["-p1"],
98-
patches = [
99-
# https://github.com/bazel-contrib/rules_jvm/pull/194
100-
"//third_party:rules_jvm-fix-junit5-for-early-access-builds.patch",
101-
],
102-
sha256 = "90ecdf08d7e8817b2247eea77826db872db8866da84b3a824f58d6661aca917f",
103-
strip_prefix = "rules_jvm-0.14.0",
104-
url = "https://github.com/bazel-contrib/rules_jvm/releases/download/v0.14.0/rules_jvm-v0.14.0.tar.gz",
90+
sha256 = "4d62589dc6a55e74bbe33930b826d593367fc777449a410604b2ad7c6c625ef7",
91+
strip_prefix = "rules_jvm-0.19.0",
92+
url = "https://github.com/bazel-contrib/rules_jvm/releases/download/v0.19.0/rules_jvm-v0.19.0.tar.gz",
10593
)
10694

10795
http_archive(

repositories.bzl

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -43,43 +43,23 @@ def jazzer_dependencies(android = False):
4343
maybe(
4444
http_archive,
4545
name = "io_bazel_rules_kotlin",
46-
patch_args = ["-p1"],
47-
patches = [
48-
# https://github.com/bazelbuild/rules_kotlin/pull/1000
49-
# Remove unnecessary dependency on a Java runtime for the target platform.
50-
"//third_party:rules_kotlin-remove-java-runtime-dep.patch",
51-
# https://github.com/bazelbuild/rules_kotlin/pull/1005
52-
# Required for compatibility with recent Bazel 7 pre-releases.
53-
"//third_party:rules_kotlin-remove-java-info-transitive-deps.patch",
54-
],
55-
sha256 = "01293740a16e474669aba5b5a1fe3d368de5832442f164e4fbfc566815a8bc3a",
56-
url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.8/rules_kotlin_release.tgz",
46+
sha256 = "a630cda9fdb4f56cf2dc20a4bf873765c41cf00e9379e8d59cd07b24730f4fde",
47+
url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.8.1/rules_kotlin_release.tgz",
5748
)
5849

5950
maybe(
6051
http_archive,
6152
name = "rules_jvm_external",
62-
patch_args = ["-p1"],
63-
patches = [
64-
# https://github.com/bazelbuild/rules_jvm_external/pull/958
65-
# Allows javadoc targets to reference other javadoc targets.
66-
"//third_party:rules_jvm_external-javadoc-deps.patch",
67-
# https://github.com/bazelbuild/rules_jvm_external/pull/960
68-
# Forwards the toolchains attribute on java_export to all underlying targets and
69-
# evaluates Make variables from deps in pom_file.
70-
"//third_party:rules_jvm_external-toolchains-attribute.patch",
71-
],
72-
sha256 = "aa17db9b810b22e411bf722095be34eeb66c76819b9c3423ad7740f452016aa3",
73-
strip_prefix = "rules_jvm_external-4b073de468eff9741406f475acb04e94bee7c9d0",
74-
url = "https://github.com/bazelbuild/rules_jvm_external/archive/4b073de468eff9741406f475acb04e94bee7c9d0.tar.gz",
53+
sha256 = "5061364ad9c53de3d2072975f6c14768f2982bbf4101442306270554b317772e",
54+
strip_prefix = "rules_jvm_external-f0c92a5aa7a9ea457ec3b89c76c59ff72829d9d7",
55+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/f0c92a5aa7a9ea457ec3b89c76c59ff72829d9d7.tar.gz",
7556
)
7657

7758
maybe(
7859
http_archive,
7960
name = "build_bazel_apple_support",
80-
sha256 = "ce80afe548fd71ef27b48cb48a283ca21256a0900caec3c7ed9416241e000bfe",
81-
strip_prefix = "apple_support-dab92884a6f031e63ac263e5de8a02f13ac42508",
82-
url = "https://github.com/bazelbuild/apple_support/archive/dab92884a6f031e63ac263e5de8a02f13ac42508.tar.gz",
61+
sha256 = "62cb8c6658739d22986bbe4b025fe9f0f42cce91394096dc85d64b120ccde229",
62+
url = "https://github.com/bazelbuild/apple_support/releases/download/1.10.1/apple_support.1.10.1.tar.gz",
8363
)
8464

8565
maybe(
@@ -93,9 +73,9 @@ def jazzer_dependencies(android = False):
9373
maybe(
9474
http_archive,
9575
name = "com_github_johnynek_bazel_jar_jar",
96-
sha256 = "85260ebdaf86cf0ce6d0d0f0a3268a09f628c815513141a6b99a023116523f96",
97-
strip_prefix = "bazel_jar_jar-78c8c13ff437e8397ffe80c9a4c905376720a339",
98-
url = "https://github.com/bazeltools/bazel_jar_jar/archive/78c8c13ff437e8397ffe80c9a4c905376720a339.tar.gz",
76+
sha256 = "7487df7cf64ef85bdd5ffc6a0aff92c46ff7550a663c41b262d53f9dc90cd53d",
77+
strip_prefix = "bazel_jar_jar-4e7bf26da8bc8c955578fd8c8a2c763757d344df",
78+
url = "https://github.com/bazeltools/bazel_jar_jar/archive/4e7bf26da8bc8c955578fd8c8a2c763757d344df.tar.gz",
9979
)
10080

10181
maybe(

0 commit comments

Comments
 (0)