Mike Kruskal
391cc7b355
Merge pull request #10653 from mkruskal-google/sync-stage
...
Integrate from Piper for C++, Java, and Python
2 years ago
Mike Kruskal
12bedd20c3
Updating changelog
2 years ago
Mike Kruskal
38da0b3d42
Merge tag 'refs/tags/sync-piper' into sync-stage
...
# Conflicts:
# src/google/protobuf/arena.cc
# src/google/protobuf/compiler/java/enum_field_lite.cc
2 years ago
Mike Kruskal
e99b2819ee
Sync from Piper @476205078
...
PROTOBUF_SYNC_PIPER
2 years ago
Thomas Van Lenten
bc4cbf9a05
Remove the pre Xcode 10.2 support.
...
objectivec/README.md lists Xcode 10.2 as the minimum, update things accordingly.
- Remove code paths referencing the older versions.
- Remove support from the testing script.
2 years ago
Thomas Van Lenten
ecd63bb219
Format the test sources.
2 years ago
Thomas Van Lenten
189f6325d4
Format the runtime sources.
2 years ago
Thomas Van Lenten
5d0b2175c3
Format the headers.
2 years ago
Thomas Van Lenten
9e069b2e51
[ObjC] Tweak some things to be better shape for clang-format.
...
- Minor formatting changes to make thing happy.
- Block clang-format from the PDDM macro definitions to avoid it wrapping
things.
- Don't add clang-format directives to the expansion, easier to handling
it outside of there.
2 years ago
Thomas Van Lenten
7c64628669
[ObjC] Output directive to disable clang-format on generated files.
...
Regenerate the WKTs accordingly.
2 years ago
Mike Kruskal
374465f683
Merge pull request #10636 from mkruskal-google/sync-stage
...
Integrate from Piper for C++, Java, and Python
2 years ago
Mike Kruskal
2ce17c08a2
Fixing sync problems
2 years ago
Mike Kruskal
1bd3d1932a
Update changelog
2 years ago
Mike Kruskal
c3e751aac6
Sync from Piper @475378801
...
PROTOBUF_SYNC_PIPER
2 years ago
Miguel Young
b971bea8aa
Merge pull request #10635 from mcy/retrigger-kokoro
...
Unbreak Windows tests
2 years ago
Miguel Young de la Sota
0a60bdc070
Fix a UAF in descriptor.cc that slipped past CI
2 years ago
Miguel Young
d3b5389301
Merge pull request #10581 from jhump/jh/custom-json-name-validation
...
protoc: validate custom json_name configuration
2 years ago
Mike Kruskal
bcd175578f
Merge pull request #10586 from jhump/jh/validate-reserved-names
...
protoc: validate reserved names are identifiers
2 years ago
Josh Humphries
8f17f57855
don't return false and abort parsing of current statement
2 years ago
Josh Humphries
072fb8f58a
downgrade to a warning
2 years ago
Josh Humphries
c7ba0553f5
return struct instead of using out param
2 years ago
Josh Humphries
8e74523ff6
address review feedback
2 years ago
Dennis Shao
3a05f4363e
Merge pull request #10629 from protocolbuffers/shaod2-patch-1
...
Correct the link to example WORKSPACE file
2 years ago
Dennis Shao
790f85dad2
Correct the link to example WORKSPACE file
2 years ago
Mike Kruskal
2dcd3e4a01
Merge pull request #10623 from mkruskal-google/sync-stage
...
Integrate from Piper for C++, Java, and Python
2 years ago
Mike Kruskal
d4af9c919f
Fixing bad merges, updating generated files
2 years ago
Mike Kruskal
719dc252a3
Update changelog
2 years ago
Mike Kruskal
ab09b6421a
Merge remote-tracking branch 'refs/remotes/upstream/main' into sync-stage
...
# Conflicts:
# src/google/protobuf/compiler/objectivec/objectivec_enum.cc
# src/google/protobuf/compiler/objectivec/objectivec_extension.cc
# src/google/protobuf/compiler/objectivec/objectivec_field.cc
# src/google/protobuf/compiler/objectivec/objectivec_file.cc
# src/google/protobuf/compiler/objectivec/objectivec_generator.cc
# src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
# src/google/protobuf/compiler/objectivec/objectivec_message.cc
# src/google/protobuf/compiler/objectivec/objectivec_oneof.cc
# src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
# src/google/protobuf/compiler/plugin.pb.h
# src/google/protobuf/descriptor.pb.h
2 years ago
Mike Kruskal
634a49adf3
Merge tag 'refs/tags/sync-piper' into sync-stage
2 years ago
Mike Kruskal
d85c9944c5
Sync from Piper @475378801
...
PROTOBUF_SYNC_PIPER
2 years ago
Thomas Van Lenten
5392dc1dd4
[ObjC] Use a real import for GPBExtensionRegistry.
...
The fwd decls can lead to ambiguity for downstream users, so use a full import
to avoid the potential issues.
2 years ago
Matt Fowles Kulukundis
45413e29a4
Merge pull request #10621 from tpudlik/pw_extension
...
Add reserved extension number for Pigweed
2 years ago
Ted Pudlik
99955470e0
Add reserved extension number for Pigweed
...
The extension number will be used for providing custom options to the
Pigweed protobuf compiler. Support for this is added in
https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/110632 .
2 years ago
Thomas Van Lenten
6a28393f08
Keep the class forward declaration also.
...
Some users might be depended on these, so until everything is flipped to
explicit imports, need to still provide the class declaration so the proto isn't
a breaking change.
2 years ago
Mike Kruskal
81e35132bf
Improve CMake installation tests ( #10615 )
...
* Using glob to remove headers instead of cyclic file_lists
* Simplify CMake config and include missing files
* Don't remove generated proto headers
* Fix broken CMake proto dependencies instead of opting out pb.h files.
* Fixing cyclic dependency
2 years ago
Mike Kruskal
01c340d0bb
Adding full build to 32 bit tests ( #10589 )
...
* Adding full build to 32 bit tests
* Running C++ tests in 32 bit builds
* Patching static assert test failure
* Test fixes for 32-bit architectures
* Cleanup after CMake build
* Save protoc before cleanup
* Route protoc better
2 years ago
Thomas Van Lenten
f191ab0f35
Provide a protocol for GPBExtensionRegistry's lookup support.
...
This allows some to use an alternative registry if they have a different
implementation.
This is really just wiring though the change to use the GPBExtensionRegistry
protocol vs the concrete GPBExtensionRegistry through the other apis.
2 years ago
Mike Kruskal
e18aa2eda7
Fix broken examples build ( #10614 )
...
* Add .bazelrc for examples repo
* Include examples in some of our basic tests
2 years ago
Protobuf Team Bot
fe9db54ced
Auto-generate CMake file lists after PR #10612
2 years ago
Adam Cozzette
975ed9f704
Make slight change to ordering in src/file_lists.cmake ( #10612 )
...
This change does not directly do anything useful, but the goal is to
confirm that the GitHub action for auto-generating file_lists.cmake will
quickly rewrite the file in its canonical form.
2 years ago
Adam Cozzette
6be96e7a20
Run CMake file auto-generation only on the main protobuf repo ( #10611 )
...
This workflow will otherwise fail on forks, so let's make sure to do it
only on the main repo where we need it.
2 years ago
Adam Cozzette
805812ec90
Auto-generate CMake file lists in GitHub action ( #10592 )
...
This GitHub action will run after each pull request merge and will auto-update
the file lists in in src/file_lists.cmake. The action will run as our
bot account.
I realized that if a bug somehow made the file generation
non-idempotent, this could trigger an infinite loop of commits, so I put
in an extra safeguard against that. If the previous commit was by
"Protobuf Team Bot", the GitHub action will revert any local changes to
ensure that no new commit will be made.
2 years ago
Thomas Van Lenten
2202cc8d33
Add clang-format for some things are well formatted already.
...
The sources haven't yet been reformatted, there are lots of Print() calls that
end up worse, but those should probably get revisit to Emit() instead.
2 years ago
deannagarcia
39ccc1c510
Merge pull request #10599 from deannagarcia/kotlinPublic
...
Add "public" modifier to Kotlin generated code
2 years ago
Deanna Garcia
42ce332a5f
Add missing modifier
2 years ago
Deanna Garcia
47a3ccf756
Add missing public
2 years ago
Deanna Garcia
b6a3f6eb98
Add public modifier
2 years ago
Matt Fowles Kulukundis
c4644b77cb
Merge pull request #10555 from jhump/jh/fix-consistency-with-very-large-decimal-numbers
...
protoc: fix consistency with parsing very large decimal numbers
2 years ago
Joshua Humphries
e293b5cc43
clarify comment
2 years ago
Joshua Humphries
7e745c4910
oops, fix name: LOG -> GOOGLE_LOG
2 years ago