Skip to content

Commit c126c63

Browse files
cgrindel-self-hosted-renovate[bot]cgrindelmergify[bot]
authored
chore(deps): update dependency protobuf to v33 (#1872)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [protobuf](https://redirect.github.com/protocolbuffers/protobuf) | bazel_dep | major | `32.1` -> `33.0` | --- ### Release Notes <details> <summary>protocolbuffers/protobuf (protobuf)</summary> ### [`v33.0`](https://redirect.github.com/protocolbuffers/protobuf/releases/tag/v33.0): Protocol Buffers v33.0 ##### Announcements - [Protobuf News](https://protobuf.dev/news/) may include additional announcements or pre-announcements for upcoming changes. ##### Bazel - Feat: update bazel central registry publish workflow ([#&#8203;23465](https://redirect.github.com/protocolbuffers/protobuf/issues/23465)) ([#&#8203;23913](https://redirect.github.com/protocolbuffers/protobuf/issues/23913)) (protocolbuffers/protobuf@d5217fd) - Add target\_compatible\_with parameter to proto\_toolchain in Bazel rules ([#&#8203;22429](https://redirect.github.com/protocolbuffers/protobuf/issues/22429)) (protocolbuffers/protobuf@30d2332) - Bazel: add missing rules\_cc loads ([#&#8203;23584](https://redirect.github.com/protocolbuffers/protobuf/issues/23584)) (protocolbuffers/protobuf@d98e2ef) ##### Compiler - Disable symbol visibility enforcement by default in C++ runtime (protocolbuffers/protobuf@ae308fc) - Ship all option dependencies to plugins along with regular ones. (protocolbuffers/protobuf@abeb130) ##### C++ - Avoid calling deprecated arena-enabled constructors in arena.h. (protocolbuffers/protobuf@813a7ef) - Add a macro to make `RepeatedField(Arena*)` constructor private in a future release. (protocolbuffers/protobuf@768db14) - Add a macro to make `Map(Arena*)` constructor private in a future release. (protocolbuffers/protobuf@543a17f) - Optimize ReadPackedVarint (protocolbuffers/protobuf@3d94d83) - Add a macro to make `RepeatedPtrField(Arena*)` constructor private in a future release (protocolbuffers/protobuf@6422b9d) - Add IsEmpty() function to reflection. (protocolbuffers/protobuf@b64e490) - Refactor `RuntimeAssertInBounds` to remove repeated logic and make `Get`/`Mutable` easier to read. (protocolbuffers/protobuf@2f270c4) - Disable symbol visibility enforcement by default in C++ runtime (protocolbuffers/protobuf@ae308fc) - Fix a bug in the main C++ JSON parser/serializer camelcasing of certain non-style-compliant names incorrectly, in a way that would prevent it from interoperating with any other implementation on those fields. (protocolbuffers/protobuf@e25e267) - Fail early for messages with more than 65k fields. (protocolbuffers/protobuf@90824aa) - Add option to C++ JSON Parser/Serializer to allow customers to affirmatively disable legacy bug-compatibilty behaviors. (protocolbuffers/protobuf@6ea1640) - Fix mishandling on JSON serialization of Timestamp with invalid negative and too-large nanos value. (protocolbuffers/protobuf@a959f27) - Preserve features in type resolver (protocolbuffers/protobuf@c7030f4) - Add a DCHECK that ArenaStringPtr::Set(char\*, Arena\*) is not called with (protocolbuffers/protobuf@95b1763) ##### Java - Switch the pre22 warning to use CopyOnWriteArraySet. ([#&#8203;23969](https://redirect.github.com/protocolbuffers/protobuf/issues/23969)) (protocolbuffers/protobuf@e55224c) - Expose helpers for checking if messages and enums are nested. (protocolbuffers/protobuf@8de4002) - Fix a bug calculating the file name in the absense of directories. (protocolbuffers/protobuf@c4ff7a6) - Clarify the public APIs of GeneratorNames helpers. (protocolbuffers/protobuf@537ac35) - Expose helpers to predict generated class names in java. (protocolbuffers/protobuf@eba6df2) - Deprecate ClassName methods in favor of new QualifiedClassName ones. (protocolbuffers/protobuf@ca4fb2f) - Restore the 3-argument internalBuildGeneratedFileFrom. (protocolbuffers/protobuf@4376591) - Fix large java enums not being honored on lite runtime. (protocolbuffers/protobuf@a995803) - Slightly relax Java Poison Pill on prerelease versions (-rc1, -dev, etc). (protocolbuffers/protobuf@7b0bee3) - Avoid boxing/unboxing `varint`, `fixed32`, and `fixed64` fields in `UnknownFieldSet.Field` (protocolbuffers/protobuf@810272f) - Readd new\*List() methods on GeneratedMessageV3. (protocolbuffers/protobuf@badaf41) - Add Values.of(Map\<String, Value> values). (protocolbuffers/protobuf@c518f25) - Fix handling of optional dependencies in java generator. (protocolbuffers/protobuf@8d51e34) - Restore ABI compatibility for extension methods which was previously (knowingly) broken with 4.x: protocolbuffers/protobuf@94a2a44 (protocolbuffers/protobuf@ea33ae8) - Restore Protobuf Java extension modifiers in gencode that were previously removed in protocolbuffers/protobuf@7bff169 (protocolbuffers/protobuf@f2257f5) - Ship all option dependencies to plugins along with regular ones. (protocolbuffers/protobuf@abeb130) - Optimize redaction state calculation (protocolbuffers/protobuf@e05db5c) - Add `isPlaceholder()` accessors to file, message, and enum descriptors (protocolbuffers/protobuf@f978ec2) - Improve Java gencode static initialization to avoid unnecessary temporaries again (protocolbuffers/protobuf@745e15b) - Improve Java gencode static initialization to avoid unnecessary temporaries (protocolbuffers/protobuf@b68b673) - Remove protobuf-util usages of guava except annotations. (protocolbuffers/protobuf@5768acd) - Restore compatibility of runtime with pre-3.22.x gencode impacted by CVE-2022-3171 (protocolbuffers/protobuf@7c51e5b) - Expose an iterator for `GeneratedMessage.ExtendableMessage.extensions` (protocolbuffers/protobuf@b25d39e) ##### Rust - Change Rust prelude to bring in traits as `_` (protocolbuffers/protobuf@c3f7e8d) - Make message Muts `Send` (protocolbuffers/protobuf@8bff944) - *See also UPB changes below, which may affect Rust.* ##### Python - Publish s390x wheels for Python/upb. (protocolbuffers/protobuf@56b2b89) - Fix a crash that happens during shutdown due to looking up modules in the cache (protocolbuffers/protobuf@d57d270) - Add construction support for repeated Timestamp/Duration/Struct/ListValue. (protocolbuffers/protobuf@5f6c013) - Fix handling of repeated extension fields in PyProto JSON (protocolbuffers/protobuf@07ef676) - Fixed a parser bug where closed enums are parsed incorrectly for non-repeated extensions. (protocolbuffers/protobuf@c36f728) - Fixed mypy errors by setting `__slots__` to empty in `.pyi` files. (protocolbuffers/protobuf@38ca2d3) - Raise warnings for float\_precision from python json\_format. (protocolbuffers/protobuf@4659cd7) - Raise warnings when assign bool to int/enum field in Python Proto. This will turn into error in 34.0 release. (protocolbuffers/protobuf@4ee55d7) ##### PHP - Fix(php): php errors on repeated field ([#&#8203;23372](https://redirect.github.com/protocolbuffers/protobuf/issues/23372)) (protocolbuffers/protobuf@6fee29b) ##### UPB (Python/PHP/Ruby C-Extension) - Fixed a parser bug where closed enums are parsed incorrectly for non-repeated extensions. (protocolbuffers/protobuf@c36f728) ##### Other - Update token for BCR release to reuse existing BOT\_ACCESS\_TOKEN used for staleness\_refresh.yml and update\_php\_repo.yml ([#&#8203;23925](https://redirect.github.com/protocolbuffers/protobuf/issues/23925)) (protocolbuffers/protobuf@dcace2f) - Use the 'better' JSON parser on the conformance suite harness. (protocolbuffers/protobuf@4b4e405) - Add JSON conformance test that a single value provided for a repeated field should parse fail. (protocolbuffers/protobuf@9806994) - Add conformance test cases for malformed nanos fields on Durations and Timestamps. (protocolbuffers/protobuf@a6bdd0a) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4wLjAiLCJ1cGRhdGVkSW5WZXIiOiI0MS4wLjAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbXX0=--> --------- Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: Chuck Grindel <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 4d3775f commit c126c63

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

examples/grpc_example/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bazel_dep(name = "cgrindel_bazel_starlib", version = "0.27.0")
1515

1616
# Required by custom swift proto compiler plugin:
1717
bazel_dep(name = "bazel_skylib", version = "1.8.2")
18-
bazel_dep(name = "protobuf", version = "32.1")
18+
bazel_dep(name = "protobuf", version = "33.0")
1919

2020
# Required for proto_library targets:
2121
bazel_dep(name = "rules_proto", version = "7.1.0")

examples/grpc_example/Package.resolved

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swiftpkg/internal/clang_files.bzl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ _ASSEMBLY_SRC_EXTS = [".S"]
3030
# Sources that should be included when constructing other cc_xxx targets
3131
_OTHER_SRC_EXTS = [".so", ".o", ".inc"]
3232

33+
_TEXTUAL_HDR_EXTS = [".def", ".macros"]
34+
3335
# Acceptable sources clang and objc:
3436
# https://bazel.build/reference/be/c-cpp#cc_library.srcs
3537
# https://bazel.build/reference/be/objective-c#objc_library.srcs
@@ -247,15 +249,15 @@ def _collect_files(
247249
hdrs_set = sets.make()
248250
srcs_set = sets.make()
249251
others_set = sets.make()
250-
def_files_set = sets.make()
252+
textual_hdrs_set = sets.make()
251253

252254
modulemap = None
253255
modulemap_orig_path = None
254256
for orig_path in all_srcs:
255257
path = _relativize(orig_path, relative_to)
256258
_root, ext = paths.split_extension(path)
257-
if ext == ".def":
258-
sets.insert(def_files_set, path)
259+
if lists.contains(_TEXTUAL_HDR_EXTS, ext):
260+
sets.insert(textual_hdrs_set, path)
259261
elif lists.contains(_HEADER_EXTS, ext):
260262
if _is_include_hdr(orig_path, public_includes = public_includes):
261263
sets.insert(hdrs_set, path)
@@ -347,7 +349,7 @@ def _collect_files(
347349
if not _is_hdr(src):
348350
textual_hdrs.append(src)
349351

350-
textual_hdrs.extend(sets.to_list(def_files_set))
352+
textual_hdrs.extend(sets.to_list(textual_hdrs_set))
351353

352354
# Remove the prefixes before returning the results
353355
return struct(

0 commit comments

Comments
 (0)