Skip to content
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
12 changes: 8 additions & 4 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ bazel_dep(name = "emsdk", version = "4.0.13")
bazel_dep(name = "envoy_examples", version = "0.0.0-dev")
git_override(
module_name = "envoy_examples",
commit = "ff286d4049b6339cf84c912f5e06f67b0061f017",
commit = "a531e3e0031c673ad9b2e1e6c749c074e4940702",
remote = "https://github.com/envoyproxy/examples.git",
)

bazel_dep(name = "envoy-example-wasmcc", version = "0.0.0-dev")
git_override(
module_name = "envoy-example-wasmcc",
commit = "ff286d4049b6339cf84c912f5e06f67b0061f017",
commit = "a531e3e0031c673ad9b2e1e6c749c074e4940702",
remote = "https://github.com/envoyproxy/examples.git",
strip_prefix = "wasm-cc/",
)
Expand Down Expand Up @@ -77,6 +77,10 @@ bazel_dep(name = "rules_buf", version = "0.5.1")
bazel_dep(name = "rules_cc", version = "0.2.8")
bazel_dep(name = "rules_foreign_cc", version = "0.15.0")
bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go")
bazel_dep(name = "rules_java", version = "8.14.0")
java_compat = use_extension("@rules_java//java:rules_java_deps.bzl", "compatibility_proxy")
use_repo(java_compat, "compatibility_proxy")

bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_nodejs", version = "6.5.0")
bazel_dep(name = "rules_pkg", version = "1.1.0")
Expand Down Expand Up @@ -129,7 +133,8 @@ switched_rules.use_languages(
grpc = True,
python = True,
)
use_repo(switched_rules, "com_google_googleapis_imports")
# Note: com_google_googleapis_imports is not generated by switched_rules extension in googleapis 0.0.0-20241220
# The switched_rules extension now uses language-specific repositories (googleapis-cc, googleapis-go, etc.)

# Go SDK and toolchain configuration
# Note: dev_dependency = True was removed to fix nogo visibility issues.
Expand Down Expand Up @@ -309,7 +314,6 @@ use_repo(
"proxy_wasm_cpp_sdk",
"proxy_wasm_rust_sdk",
"rules_fuzzing",
"rules_java",
"rules_proto_grpc",
"rules_ruby",
"simdutf",
Expand Down
3 changes: 2 additions & 1 deletion api/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ switched_rules.use_languages(
grpc = True,
python = True,
)
use_repo(switched_rules, "com_google_googleapis_imports")
# Note: com_google_googleapis_imports is not generated by switched_rules extension in googleapis 0.0.0-20241220
# The switched_rules extension now uses language-specific repositories (googleapis-cc, googleapis-go, etc.)

# API dependencies extension - using local module
envoy_api_deps = use_extension("//bazel/extensions:api_dependencies.bzl", "envoy_api_deps")
Expand Down
3 changes: 2 additions & 1 deletion api/bazel/api_build_system.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ load("@com_github_grpc_grpc//bazel:python_rules.bzl", _py_proto_library = "py_pr
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("@io_bazel_rules_go//go:def.bzl", "go_test")
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
load("@rules_java//java:defs.bzl", "java_proto_library")
load(
"//bazel:external_proto_deps.bzl",
"EXTERNAL_PROTO_CC_BAZEL_DEP_MAP",
Expand Down Expand Up @@ -114,7 +115,7 @@ def api_cc_py_proto_library(
)

if java:
native.java_proto_library(
java_proto_library(
name = name + _JAVA_PROTO_SUFFIX,
visibility = ["//visibility:public"],
deps = [relative_name],
Expand Down
6 changes: 3 additions & 3 deletions bazel/emsdk.patch
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ index a989450..4f1c213 100644
--- a/bazel/emscripten_toolchain/BUILD.bazel
+++ b/bazel/emscripten_toolchain/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@python3_12//:defs.bzl", "py_binary")
+load("@python_3_12//:defs.bzl", "py_binary")
load(":toolchain.bzl", "emscripten_cc_toolchain_config_rule")

package(default_visibility = ["//visibility:public"])
@@ -9,6 +10,7 @@ filegroup(
"env.sh",
"env.bat",
"@nodejs//:node_files",
+ "@python3_12//:files",
+ "@python_3_12//:files",
],
)

Expand Down Expand Up @@ -479,7 +479,7 @@ index c8cec07..9559cd1 100644
"nodejs_bin": attr.label(mandatory = True, allow_single_file = True),
- "script_extension": attr.string(mandatory = True, values = ["sh", "bat"]),
+ "is_windows": attr.bool(mandatory = True),
+ "_python_interpreter": attr.label(cfg = "exec", default = Label("@python3_12//:files")),
+ "_python_interpreter": attr.label(cfg = "exec", default = Label("@python_3_12//:files")),
},
provides = [CcToolchainConfigInfo],
)
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1097,9 +1097,9 @@ REPOSITORY_LOCATIONS_SPEC = 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.5",
sha256 = "17b18cb4f92ab7b94aa343ce78531b73960b1bed2ba166e5b02c9fdf0b0ac270",
release_date = "2025-03-25",
version = "8.14.0",
sha256 = "bbe7d94360cc9ed4607ec5fd94995fd1ec41e84257020b6f09e64055281ecb12",
release_date = "2025-01-29",
urls = ["https://github.com/bazelbuild/rules_java/releases/download/{version}/rules_java-{version}.tar.gz"],
use_category = ["build"],
license = "Apache-2.0",
Expand Down
23 changes: 15 additions & 8 deletions mobile/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ bazel_dep(name = "rules_detekt", version = "0.8.1.2") # Kotlin linting
# rules_foreign_cc override needed for mobile builds until upstream issue is resolved
# TODO(yannic): Remove once https://github.com/bazelbuild/rules_foreign_cc/pull/938 is merged and released
bazel_dep(name = "rules_foreign_cc", version = "0.15.0")
bazel_dep(name = "rules_java", version = "8.14.0") # Java language support
bazel_dep(name = "rules_jvm_external", version = "6.6") # Maven dependency management
bazel_dep(name = "rules_kotlin", version = "1.9.6") # Kotlin language support
bazel_dep(name = "rules_pkg", version = "1.1.0") # Package building
Expand All @@ -108,7 +109,8 @@ switched_rules.use_languages(
grpc = True,
python = True,
)
use_repo(switched_rules, "com_google_googleapis_imports")
# Note: com_google_googleapis_imports is not generated by switched_rules extension in googleapis 0.0.0-20241220
# The switched_rules extension now uses language-specific repositories (googleapis-cc, googleapis-go, etc.)

# Envoy dependencies extensions - using consolidated extensions from parent envoy module
envoy_core = use_extension("@envoy//bazel/extensions:core.bzl", "core")
Expand Down Expand Up @@ -137,16 +139,18 @@ use_repo(
"google_bazel_common",
"kotlin_formatter",
"robolectric",
"rules_java",
)

# Native Android SDK configuration using rules_android extension
# This replaces custom Android SDK setup with native bzlmod extension support
android_sdk_repository_extension = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")
android_sdk_repository_extension.configure(
api_level = 30, # Target Android API level
build_tools_version = "30.0.2", # Android build tools version
)
# NOTE: Temporarily commented out due to missing BUILD file in rules_android 0.1.1
# The android_sdk_repository_extension path may have changed in newer versions
# android_sdk_repository_extension = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")
# android_sdk_repository_extension.configure(
# api_level = 30, # Target Android API level
# build_tools_version = "30.0.2", # Android build tools version
# )
# Fallback: Android SDK will be configured via mobile toolchains extension

# Native Android NDK configuration using rules_android_ndk extension
# This provides native C++ compilation support for Android targets
Expand All @@ -156,7 +160,10 @@ android_ndk_repository_extension.configure(
)

# Mobile toolchains extension (remaining custom setup)
envoy_mobile_toolchains = use_extension("//bazel/extensions:toolchains.bzl", "toolchains")
# NOTE: Commented out to avoid manual toolchain registration conflicts in bzlmod mode
# In bzlmod mode, toolchains (rules_java, rules_kotlin, rules_detekt, rules_proto_grpc) are
# automatically registered when declared as bazel_dep, so manual registration is not needed
# envoy_mobile_toolchains = use_extension("//bazel/extensions:toolchains.bzl", "toolchains")

# Python dependencies using upstream rules_python extensions
python = use_extension("@rules_python//python/extensions:python.bzl", "python", dev_dependency = True)
Expand Down
4 changes: 2 additions & 2 deletions mobile/bazel/envoy_mobile_repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ def swift_repos():
def kotlin_repos():
external_http_archive(
name = "rules_java",
sha256 = "c0ee60f8757f140c157fc2c7af703d819514de6e025ebf70386d38bdd85fce83",
url = "https://github.com/bazelbuild/rules_java/releases/download/7.12.3/rules_java-7.12.3.tar.gz",
sha256 = "bbe7d94360cc9ed4607ec5fd94995fd1ec41e84257020b6f09e64055281ecb12",
url = "https://github.com/bazelbuild/rules_java/releases/download/8.14.0/rules_java-8.14.0.tar.gz",
patch_args = ["-p1"],
patches = ["@envoy//bazel:rules_java.patch"],
)
Expand Down
Loading