Marjolein Heyndrickx
b136ee35e5
Fix Wpedantic warning 'extra ;' for c++
2 years ago
deannagarcia
b36782ae98
Merge pull request #10384 from protocolbuffers/main-202208092202
...
Merge release branch to main
2 years ago
Deanna Garcia
0e0cfb418f
Merge remote-tracking branch 'upstream/21.x' into main-202208092202
2 years ago
deannagarcia
2fb33f46a6
Merge pull request #10382 from protocolbuffers/21.x-202208092202
...
Update version.json to: 21.6-dev
2 years ago
Deanna Garcia
29f03e04d3
Update version.json to: 21.6-dev
2 years ago
Joshua Haberman
e83492d94a
Merge pull request #10282 from casperisfine/ruby-usable-ivar
...
Ruby: use a valid instance variable name for `descriptor`
2 years ago
deannagarcia
638779f353
Merge pull request #10380 from protocolbuffers/21.x-202208091710
...
Update versions and changelog in preparation for release
2 years ago
deannagarcia
08265df19d
Merge pull request #10355 from deannagarcia/makefileVersion
...
Use release version instead of libtool version in Makefile
2 years ago
Deanna Garcia
ab84034596
Update changelog
2 years ago
Protobuf Team Bot
a44b4ae39c
Updating version.json and repo version numbers to: 21.5
2 years ago
deannagarcia
3294de8ff6
Merge pull request #10376 from deannagarcia/21.x
...
Update UPB version
2 years ago
Mike Kruskal
69c1fa531c
Add windows tests for C++ builds ( #10364 )
...
* Adding non-docker builds for protoc in our supported build systems
* Tweaking bazel builds
* Fixing compatibility with older CMake used by kokoro
* Fixing configs to point to proper scripts
* Propagate errors up properly
* Reinstall Bazel, point NMake to compiler, fix broken static_assert in test
* Adding common setup, enabling long paths
* Explicitly pick 64-bit compiler
* Removing arch from nmake build
* Try to upgrade cmake for installation
* Enabling 8.3 filename support (https://bazel.build/docs/windows )
* Fixing choco calls
* Making installation use Release
* Switching to batch for common config
* Fixing some install test issues unique to Windows
* Attempt another way to get shorter Bazel paths
* More windows bazel tweaks
* Fixing shared library failure from non-exported function used in tests
* Use commandline flags instead of bazelrc
* Fix line break mismatch
* Add .exe extension for test plugin on windows
* Add temporary logging
* Switch to rootpath over hardcoded system-dependent plugin path
* Enabling symlinks/runfiles to fix broken test on windows
2 years ago
Deanna Garcia
4819eed1c2
Update UPB version
2 years ago
deannagarcia
50d23a3822
Merge pull request #10374 from deannagarcia/csharp
...
Remove Tools build from csharp release script
2 years ago
Deanna Garcia
878ff834a8
Remove Tools build from csharp release script
2 years ago
Sam Nobs
fef53c3f8e
Add extension for Oclea Service Layer RPCs
2 years ago
deannagarcia
076f4218d9
Merge pull request #10321 from q-nathangrand/fix-timestamp-fromDate-wholeSeconds
...
Fix Timestamps fromDate for negative 'exact second' java.sql.Timestamps
2 years ago
deannagarcia
e9e9421077
Merge pull request #10368 from kmizumar/fix-makerule-for-java-example
...
Fix rule for java target in examples/Makefile
2 years ago
Kiyoshi Mizumaru
9c02fff255
Fix rule for java target in examples/Makefile
2 years ago
zhangskz
79c3d07c63
Update README.md ( #10363 )
...
Previous line about checking Protocol Buffers version didn't make grammatical sense
2 years ago
Joshua Haberman
ea0c6fefcf
Merge pull request #10362 from haberman/cherry-pick-php-oneof-descriptor
...
Cherry-pick: [PHP] Added getContainingOneof and getRealContainingOneof to descriptor.
2 years ago
Joshua Haberman
23097c45f8
Merge pull request #10361 from haberman/cherry-pick-php-nested
...
fix: fix PHP readonly legacy files for nested messages
2 years ago
Matt Fowles Kulukundis
fb8edd29de
Merge pull request #10360 from fowles/sync-stage
...
Integrate from Piper for C++, Java, and Python
2 years ago
Joshua Haberman
005f6d1c91
Merge pull request #10356 from haberman/php-containing-oneof
...
[PHP] Added getContainingOneof and getRealContainingOneof to descriptor.
2 years ago
Brent Shaffer
d8f882b675
fix: fix PHP readonly legacy files for nested messages
2 years ago
Matt Fowles Kulukundis
690cd12817
Merge pull request #10358 from ctiller/patch-1
...
Remove bogus IWYU pragma
2 years ago
Matt Kulukundis
a99b5feaf6
add release notes
2 years ago
Matt Kulukundis
e8ab276325
Sync from Piper @465378928
...
PROTOBUF_SYNC_PIPER
2 years ago
Matt Kulukundis
7513a1743f
Merge tag 'refs/tags/sync-piper' into sync-stage
2 years ago
Deanna Garcia
22a5690360
Remove SOVERSION from cmake files
2 years ago
Joshua Haberman
a744c223a4
Merge pull request #10356 from haberman/php-containing-oneof
...
[PHP] Added getContainingOneof and getRealContainingOneof to descriptor.
2 years ago
Craig Tiller
8b49ff0000
Remove bogus IWYU pragma
...
Pragma points at a directory that's not in the github repo, only internally.
It's throwing gRPC's IWYU analysis and causing it to recommend bad paths.
2 years ago
Joshua Haberman
a8c600f900
Updated oneof count.
2 years ago
Joshua Haberman
763f08c620
[PHP] Added getContainingOneof and getRealContainingOneof to descriptor.
2 years ago
Deanna Garcia
15daef3b79
Use release version instead of libtool version
2 years ago
Mike Kruskal
8d3a732760
Adding shared library build test ( #10351 )
2 years ago
Matt Fowles Kulukundis
0d67dc7ded
Merge pull request #10354 from jskeet/xml-crefs
...
Fix XML comment warnings for JsonFormatter
2 years ago
Jon Skeet
8448ab9fcf
Fix XML comment warnings for JsonFormatter
2 years ago
Matt Fowles Kulukundis
449e21a350
Merge pull request #10320 from bshaffer/fix-readonly-with-nested-messages
...
fix: PHP readonly legacy files for nested messages
2 years ago
Matt Fowles Kulukundis
a6df0dbe35
Merge pull request #10350 from aucampia/patch-1
...
docs: add protoc-gen-bq-schema
2 years ago
zhangskz
c17b42fbd8
Fix typo in tests.cmake (use non-lite instead of lite) to fix Kokoro presubmit failure caught when DLL=ON. ( #10337 )
2 years ago
Matt Fowles Kulukundis
eb95655721
Merge pull request #10341 from fowles/sync-stage
...
Integrate from Piper for C++, Java, and Python
2 years ago
Iwan Aucamp
9b7ab18a13
docs: add protoc-gen-bq-schema
...
Add protoc-gen-bq-schema to the list of third party add-ons.
2 years ago
Matt Kulukundis
e031663f29
Re-reremove extract_includes.bat.in
2 years ago
Matt Kulukundis
cf540bd364
Merge tag 'refs/tags/sync-piper' into sync-stage
2 years ago
Matt Kulukundis
c7b2991888
Sync from Piper @464784061
...
PROTOBUF_SYNC_PIPER
2 years ago
Matt Fowles Kulukundis
adb5d60365
Merge pull request #10268 from tonydnewell/bugfix/issue-8101
...
Bugfix/issue 8101
2 years ago
Matt Fowles Kulukundis
e46d9dac4a
Merge pull request #10340 from jskeet/parse-clarification
...
Clarify C# MessageParser and JSON parsing behavior
2 years ago
Jon Skeet
7beb116549
Clarify C# MessageParser and JSON parsing behavior
...
Addresses #8316 as far as we want to.
2 years ago
Matt Fowles Kulukundis
7b3e6cb3f2
Merge pull request #10339 from jskeet/merge-maps
...
Implement correct map merging behavior for C#
2 years ago