Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hoist java_rules into envoy #37590

Merged
merged 2 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,11 @@ def _com_google_protobuf():
external_http_archive(
name = "rules_python",
)
external_http_archive(
name = "rules_java",
patch_args = ["-p1"],
patches = ["@envoy//bazel:rules_java.patch"],
)

for platform in PROTOC_VERSIONS:
# Ideally we dont use a private build artefact as done here.
Expand Down
12 changes: 12 additions & 0 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,18 @@ REPOSITORY_LOCATIONS_SPEC = dict(
license = "Apache-2.0",
license_url = "https://github.com/bazelbuild/rules_foreign_cc/blob/{version}/LICENSE",
),
rules_java = dict(
project_name = "Java rules for Bazel",
project_desc = "Bazel rules for the Java language",
project_url = "https://github.com/bazelbuild/rules_java/",
version = "7.12.3",
sha256 = "c0ee60f8757f140c157fc2c7af703d819514de6e025ebf70386d38bdd85fce83",
release_date = "2024-12-03",
urls = ["https://github.com/bazelbuild/rules_java/releases/download/{version}/rules_java-{version}.tar.gz"],
use_category = ["build"],
license = "Apache-2.0",
license_url = "https://github.com/bazelbuild/rules_java/blob/{version}/LICENSE",
),
rules_python = dict(
project_name = "Python rules for Bazel",
project_desc = "Bazel rules for the Python language",
Expand Down
5 changes: 2 additions & 3 deletions mobile/bazel/envoy_mobile_repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ def swift_repos():
def kotlin_repos():
http_archive(
name = "rules_java",
sha256 = "ac0757f2feca4a9c6ba9dd3d4858bbfccb019d7c48e725f76a14ddef673f728c",
strip_prefix = "rules_java-7.12.3",
url = "https://github.com/bazelbuild/rules_java/archive/7.12.3.tar.gz",
sha256 = "c0ee60f8757f140c157fc2c7af703d819514de6e025ebf70386d38bdd85fce83",
url = "https://github.com/bazelbuild/rules_java/releases/download/7.12.3/rules_java-7.12.3.tar.gz",
patch_args = ["-p1"],
patches = ["@envoy//bazel:rules_java.patch"],
)
Expand Down