bazel: Update rulesets and remove upstreamed patches

CodeIntelligenceTesting · Oct 11, 2023 · 7f1801d · 7f1801d
1 parent dacfe3f
commit 7f1801d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 732 deletions.
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -13,16 +13,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "rules_java",
-    patch_args = ["-p1"],
-    patches = [
-        # https://github.com/bazelbuild/rules_java/pull/114
-        # Remove unnecessary dependency on a Java runtime for the target platform.
-        "//third_party:rules_java-use-bootstrap-runtime-toolchain-type.patch",
-    ],
-    sha256 = "fd1d5538c8e5bbf890e1e31e983139b89710aacd0a5327ddf9afe12090ed9c78",
-    strip_prefix = "rules_java-ca72739da10036e1d2cf2aaeab78fae87673e43f",
+    sha256 = "7b0d9ba216c821ee8697dedc0f9d0a705959ace462a3885fe9ba0347ba950111",
     urls = [
-        "https://github.com/bazelbuild/rules_java/archive/ca72739da10036e1d2cf2aaeab78fae87673e43f.tar.gz",
+        "https://github.com/bazelbuild/rules_java/releases/download/6.5.1/rules_java-6.5.1.tar.gz",
     ],
 )
 
@@ -94,14 +87,9 @@ http_archive(
 
 http_archive(
     name = "contrib_rules_jvm",
-    patch_args = ["-p1"],
-    patches = [
-        # https://github.com/bazel-contrib/rules_jvm/pull/194
-        "//third_party:rules_jvm-fix-junit5-for-early-access-builds.patch",
-    ],
-    sha256 = "90ecdf08d7e8817b2247eea77826db872db8866da84b3a824f58d6661aca917f",
-    strip_prefix = "rules_jvm-0.14.0",
-    url = "https://github.com/bazel-contrib/rules_jvm/releases/download/v0.14.0/rules_jvm-v0.14.0.tar.gz",
+    sha256 = "4d62589dc6a55e74bbe33930b826d593367fc777449a410604b2ad7c6c625ef7",
+    strip_prefix = "rules_jvm-0.19.0",
+    url = "https://github.com/bazel-contrib/rules_jvm/releases/download/v0.19.0/rules_jvm-v0.19.0.tar.gz",
 )
 
 http_archive(

diff --git a/repositories.bzl b/repositories.bzl
@@ -43,43 +43,30 @@ def jazzer_dependencies(android = False):
     maybe(
         http_archive,
         name = "io_bazel_rules_kotlin",
-        patch_args = ["-p1"],
-        patches = [
-            # https://github.com/bazelbuild/rules_kotlin/pull/1000
-            # Remove unnecessary dependency on a Java runtime for the target platform.
-            "//third_party:rules_kotlin-remove-java-runtime-dep.patch",
-            # https://github.com/bazelbuild/rules_kotlin/pull/1005
-            # Required for compatibility with recent Bazel 7 pre-releases.
-            "//third_party:rules_kotlin-remove-java-info-transitive-deps.patch",
-        ],
-        sha256 = "01293740a16e474669aba5b5a1fe3d368de5832442f164e4fbfc566815a8bc3a",
-        url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.8/rules_kotlin_release.tgz",
+        sha256 = "a630cda9fdb4f56cf2dc20a4bf873765c41cf00e9379e8d59cd07b24730f4fde",
+        url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.8.1/rules_kotlin_release.tgz",
     )
 
     maybe(
         http_archive,
         name = "rules_jvm_external",
         patch_args = ["-p1"],
         patches = [
-            # https://github.com/bazelbuild/rules_jvm_external/pull/958
-            # Allows javadoc targets to reference other javadoc targets.
-            "//third_party:rules_jvm_external-javadoc-deps.patch",
             # https://github.com/bazelbuild/rules_jvm_external/pull/960
             # Forwards the toolchains attribute on java_export to all underlying targets and
             # evaluates Make variables from deps in pom_file.
             "//third_party:rules_jvm_external-toolchains-attribute.patch",
         ],
-        sha256 = "aa17db9b810b22e411bf722095be34eeb66c76819b9c3423ad7740f452016aa3",
-        strip_prefix = "rules_jvm_external-4b073de468eff9741406f475acb04e94bee7c9d0",
-        url = "https://github.com/bazelbuild/rules_jvm_external/archive/4b073de468eff9741406f475acb04e94bee7c9d0.tar.gz",
+        sha256 = "4ff84d5734b1dfbc1b25819f65f66d4f0c990c0a6ee2b72f20dfd098cf8303bf",
+        strip_prefix = "rules_jvm_external-d0cfd9d293f37a600eb380bb4b1a7ce751472429",
+        url = "https://github.com/bazelbuild/rules_jvm_external/archive/d0cfd9d293f37a600eb380bb4b1a7ce751472429.tar.gz",
     )
 
     maybe(
         http_archive,
         name = "build_bazel_apple_support",
-        sha256 = "ce80afe548fd71ef27b48cb48a283ca21256a0900caec3c7ed9416241e000bfe",
-        strip_prefix = "apple_support-dab92884a6f031e63ac263e5de8a02f13ac42508",
-        url = "https://github.com/bazelbuild/apple_support/archive/dab92884a6f031e63ac263e5de8a02f13ac42508.tar.gz",
+        sha256 = "62cb8c6658739d22986bbe4b025fe9f0f42cce91394096dc85d64b120ccde229",
+        url = "https://github.com/bazelbuild/apple_support/releases/download/1.10.1/apple_support.1.10.1.tar.gz",
     )
 
     maybe(
@@ -93,9 +80,9 @@ def jazzer_dependencies(android = False):
     maybe(
         http_archive,
         name = "com_github_johnynek_bazel_jar_jar",
-        sha256 = "85260ebdaf86cf0ce6d0d0f0a3268a09f628c815513141a6b99a023116523f96",
-        strip_prefix = "bazel_jar_jar-78c8c13ff437e8397ffe80c9a4c905376720a339",
-        url = "https://github.com/bazeltools/bazel_jar_jar/archive/78c8c13ff437e8397ffe80c9a4c905376720a339.tar.gz",
+        sha256 = "7487df7cf64ef85bdd5ffc6a0aff92c46ff7550a663c41b262d53f9dc90cd53d",
+        strip_prefix = "bazel_jar_jar-4e7bf26da8bc8c955578fd8c8a2c763757d344df",
+        url = "https://github.com/bazeltools/bazel_jar_jar/archive/4e7bf26da8bc8c955578fd8c8a2c763757d344df.tar.gz",
     )
 
     maybe(