From ea4395eb354432003f8ffc7acae63c9bc2385ff0 Mon Sep 17 00:00:00 2001 From: Philipp Stephani Date: Tue, 10 Dec 2024 00:33:24 +0100 Subject: [PATCH] Add explicit dependency on rules_java. This is necessary for Bazel 8. --- MODULE.bazel | 1 + MODULE.bazel.lock | 9 +++++---- docs/manual.org | 4 ++++ elisp/repositories.bzl | 8 ++++++++ examples/ext/MODULE.bazel.lock | 9 +++++---- examples/ext/WORKSPACE | 4 ++++ 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 622bc2b5..5bbeb5fd 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -24,6 +24,7 @@ bazel_dep(name = "platforms", version = "0.0.10") bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "rules_license", version = "1.0.0") bazel_dep(name = "rules_cc", version = "0.1.0") +bazel_dep(name = "rules_java", version = "8.6.2") bazel_dep(name = "rules_python", version = "1.0.0") bazel_dep(name = "abseil-cpp", version = "20240116.2", repo_name = "com_google_absl") bazel_dep(name = "protobuf", version = "29.1", repo_name = "com_google_protobuf") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 0bccac2d..2e126c31 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -110,7 +110,8 @@ "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1", "https://bcr.bazel.build/modules/rules_java/8.3.2/MODULE.bazel": "7336d5511ad5af0b8615fdc7477535a2e4e723a357b6713af439fe8cf0195017", "https://bcr.bazel.build/modules/rules_java/8.5.1/MODULE.bazel": "d8a9e38cc5228881f7055a6079f6f7821a073df3744d441978e7a43e20226939", - "https://bcr.bazel.build/modules/rules_java/8.5.1/source.json": "db1a77d81b059e0f84985db67a22f3f579a529a86b7997605be3d214a0abe38e", + "https://bcr.bazel.build/modules/rules_java/8.6.2/MODULE.bazel": "a06360fa8fcfc3faf3c21557945119711c863d7330a8eada3e01e332fa7f34e7", + "https://bcr.bazel.build/modules/rules_java/8.6.2/source.json": "ffd54f5fa51b4a68dc9044dc4342fefb4230782f22ee1eb922fcf086eef8be99", "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", "https://bcr.bazel.build/modules/rules_jvm_external/5.1/MODULE.bazel": "33f6f999e03183f7d088c9be518a63467dfd0be94a11d0055fe2d210f89aa909", "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036", @@ -159,7 +160,7 @@ "moduleExtensions": { "//elisp:extensions.bzl%elisp": { "general": { - "bzlTransitiveDigest": "6JAd8QlbJ4m/2L3wqxrej4X6J6XCh5xLnz7gaDF7UjA=", + "bzlTransitiveDigest": "VMNT575jdwPtSWai+ycZCvLOnhZ2VaRlIUnqwbH02Ic=", "usagesDigest": "3DNBnWLAoUV76qpAhBURaI5OO+RkYjldACmVSNU3CmA=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -525,8 +526,8 @@ }, "@@rules_java~//java:rules_java_deps.bzl%compatibility_proxy": { "general": { - "bzlTransitiveDigest": "KIX40nDfygEWbU+rq3nYpt3tVgTK/iO8PKh5VMBlN7M=", - "usagesDigest": "pwHZ+26iLgQdwvdZeA5wnAjKnNI3y6XO2VbhOTeo5h8=", + "bzlTransitiveDigest": "DRCBmRABnumUM9R6A2zGIK1jy7SWrfteZxQSxBHESH0=", + "usagesDigest": "/hPJv//V5iPJdRLye0MQZz4mnDxfs8oSCo+O8x0xJPQ=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, diff --git a/docs/manual.org b/docs/manual.org index 03d0bb15..929b3b28 100644 --- a/docs/manual.org +++ b/docs/manual.org @@ -97,6 +97,10 @@ rules_cc_dependencies() rules_cc_toolchains() +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") + +rules_java_dependencies() + load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/elisp/repositories.bzl b/elisp/repositories.bzl index 413d3fd8..b50bc433 100644 --- a/elisp/repositories.bzl +++ b/elisp/repositories.bzl @@ -59,6 +59,14 @@ def rules_elisp_dependencies(): sha256 = "4b12149a041ddfb8306a8fd0e904e39d673552ce82e4296e96fac9cbf0780e59", strip_prefix = "rules_cc-0.1.0", ) + maybe( + http_archive, + name = "rules_java", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/8.6.2/rules_java-8.6.2.tar.gz", + ], + sha256 = "a64ab04616e76a448c2c2d8165d836f0d2fb0906200d0b7c7376f46dd62e59cc", + ) maybe( http_archive, name = "rules_python", diff --git a/examples/ext/MODULE.bazel.lock b/examples/ext/MODULE.bazel.lock index 2e0fb6e0..a6f42595 100644 --- a/examples/ext/MODULE.bazel.lock +++ b/examples/ext/MODULE.bazel.lock @@ -91,7 +91,8 @@ "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1", "https://bcr.bazel.build/modules/rules_java/8.3.2/MODULE.bazel": "7336d5511ad5af0b8615fdc7477535a2e4e723a357b6713af439fe8cf0195017", "https://bcr.bazel.build/modules/rules_java/8.5.1/MODULE.bazel": "d8a9e38cc5228881f7055a6079f6f7821a073df3744d441978e7a43e20226939", - "https://bcr.bazel.build/modules/rules_java/8.5.1/source.json": "db1a77d81b059e0f84985db67a22f3f579a529a86b7997605be3d214a0abe38e", + "https://bcr.bazel.build/modules/rules_java/8.6.2/MODULE.bazel": "a06360fa8fcfc3faf3c21557945119711c863d7330a8eada3e01e332fa7f34e7", + "https://bcr.bazel.build/modules/rules_java/8.6.2/source.json": "ffd54f5fa51b4a68dc9044dc4342fefb4230782f22ee1eb922fcf086eef8be99", "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", "https://bcr.bazel.build/modules/rules_jvm_external/5.1/MODULE.bazel": "33f6f999e03183f7d088c9be518a63467dfd0be94a11d0055fe2d210f89aa909", "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036", @@ -166,7 +167,7 @@ }, "@@phst_rules_elisp~//elisp:extensions.bzl%elisp": { "general": { - "bzlTransitiveDigest": "6JAd8QlbJ4m/2L3wqxrej4X6J6XCh5xLnz7gaDF7UjA=", + "bzlTransitiveDigest": "VMNT575jdwPtSWai+ycZCvLOnhZ2VaRlIUnqwbH02Ic=", "usagesDigest": "srJG6iQi4EK6+sAdrTUk/hrHh8CK8JGkr68bcFkBBEk=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -343,8 +344,8 @@ }, "@@rules_java~//java:rules_java_deps.bzl%compatibility_proxy": { "general": { - "bzlTransitiveDigest": "KIX40nDfygEWbU+rq3nYpt3tVgTK/iO8PKh5VMBlN7M=", - "usagesDigest": "pwHZ+26iLgQdwvdZeA5wnAjKnNI3y6XO2VbhOTeo5h8=", + "bzlTransitiveDigest": "DRCBmRABnumUM9R6A2zGIK1jy7SWrfteZxQSxBHESH0=", + "usagesDigest": "/hPJv//V5iPJdRLye0MQZz4mnDxfs8oSCo+O8x0xJPQ=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, diff --git a/examples/ext/WORKSPACE b/examples/ext/WORKSPACE index 8d014903..f253b7ba 100644 --- a/examples/ext/WORKSPACE +++ b/examples/ext/WORKSPACE @@ -37,6 +37,10 @@ rules_cc_dependencies() rules_cc_toolchains() +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") + +rules_java_dependencies() + load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories()