Commit Graph

9448 Commits

Author SHA1 Message Date
zhangskz
55fe00e35e
Merge pull request #10071 from protocolbuffers/21.x-202205272218
Update version.json to 21.2-dev
2022-05-27 23:25:37 +00:00
zhangskz
fd896733a5
Merge branch '21.x' into 21.x-202205272218 2022-05-27 23:24:44 +00:00
Sandy Zhang
6bd7c2e48c Update version.json to: 21.2-dev 2022-05-27 23:19:49 +00:00
Sandy Zhang
569a0517fa Updated changelog 2022-05-27 14:07:46 -04:00
Protobuf Team Bot
38e3a11a29 Updating version.json and repo version numbers to: 21.1 2022-05-27 14:07:46 -04:00
Protobuf Team Bot
e73ed1630f Updating version.json and repo version numbers to: 21.1 2022-05-27 09:37:14 -07:00
zhangskz
5bbb8f7b2c
Update upb commit to include fix for segmentation fault when instantiating field via repeated field assignment (#10066) 2022-05-27 12:16:33 -04:00
deannagarcia
d4e1c668ad
Merge pull request #10047 from protocolbuffers/temp
Update version.json to: 21.1-dev
2022-05-27 16:02:45 +00:00
Adam Cozzette
3b029b1f4f
Revert "Fix cmake install targets (#9822)" (#10060)
This reverts commit c80808ce1d.

Thix fixes #10045. Somehow the change caused these four .cmake files to
stop being installed:

protobuf-config.cmake
protobuf-config-version.cmake
protobuf-module.cmake
protobuf-options.cmake

After reverting the change, I confirmed that the files are being
installed again.
2022-05-26 14:11:37 -07:00
zhangskz
16a86804c0
Update upb commit/sha256 to include updated python wheel (#10058) 2022-05-26 15:36:41 -04:00
Adam Cozzette
f7e2e0b301
Remove Abseil dependency from CMake build (#10056)
* Revert "Added cmake abseil include guard"

This reverts commit b6ee841d7c.

* Revert "Update CMake configuration to add a dependency on Abseil (#9793)"

This reverts commit e9246cd789.
2022-05-26 12:13:41 -07:00
Adam Cozzette
30f446820d
Add endian.h to includes list (#10057)
Client code is breaking due to missing include.  (endian.h was added in 9e09343 but didn't make it into this list, so it wasn't getting installed)

Co-authored-by: boscosiu <boscosiu@users.noreply.github.com>
2022-05-26 12:09:49 -07:00
Deanna Garcia
698d760f8d Update version.json to: 21.1-dev 2022-05-26 01:24:35 +00:00
deannagarcia
e7e8f04a4f
Merge pull request #10044 from protocolbuffers/21.x-202205252102
Update versions and changelog for 21.x
2022-05-25 21:50:17 +00:00
Deanna Garcia
7062d0a2d0 Updated changelog 2022-05-25 21:15:04 +00:00
Protobuf Team Bot
59c6ff83e9 Updating version.json and repo version numbers to: 21.0 2022-05-25 13:51:01 -07:00
Joshua Haberman
ec4c19b962
Merge pull request #10036 from haberman/rollback-readonly
Revert "fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibi…lity (#9633)"
2022-05-24 16:33:50 -07:00
Joshua Haberman
8984184e54 Revert "fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)"
This reverts commit eb27c201f1.
2022-05-24 21:06:00 +00:00
Joshua Haberman
0b2cee6486
Merge pull request #10025 from haberman/fix-windows-protoc
Fixed the Windows build of protoc by statically linking deps.
2022-05-23 15:01:04 -07:00
Joshua Haberman
2dc7679cc1 Fixed the Windows build of protoc by statically linking deps. 2022-05-23 20:59:31 +00:00
deannagarcia
6d2827b377
Merge pull request #10019 from deannagarcia/fixCocoapods
Fix podspecs
2022-05-20 15:54:24 -07:00
Deanna Garcia
942cec077a Fix podspecs 2022-05-20 21:43:48 +00:00
deannagarcia
6673c7c48f
Merge pull request #10006 from protocolbuffers/21.x-202205200038
Update version.json to: 21.0-dev
2022-05-20 10:17:11 -07:00
Deanna Garcia
ecaeadeced Update version.json to: 21.0-dev 2022-05-20 00:38:39 +00:00
Deanna Garcia
71271ad1f8 Edit changelog 2022-05-19 20:42:46 +00:00
Protobuf Team Bot
1fa42c4be4 Updating version.json and repo version numbers to: 21.0-rc2 2022-05-19 13:35:48 -07:00
deannagarcia
d031130582
Merge pull request #10000 from jskeet/21.x
Cherry-pick PR #9981 into 21.x branch
2022-05-19 10:38:31 -07:00
Joshua Haberman
bf771eb540
Merge pull request #9996 from haberman/cherry-pick-php-segv-fix
Fixed PHP SEGV by not writing to shared memory for zend_class_entry.
2022-05-19 08:44:28 -07:00
Jan Tattermusch
70afbd3c8d regenerate C# protos 2022-05-19 16:42:21 +01:00
James Newton-King
9806b0f57b Suppress CS8981 in generated source 2022-05-19 16:42:20 +01:00
Joshua Haberman
a04d00312f Fixed PHP SEGV by not writing to shared memory for zend_class_entry. 2022-05-19 04:15:51 +00:00
Joshua Haberman
fe3d67cb8e
Merge pull request #9986 from haberman/update-upb3
Updated upb, which will give a better error message if generated code is out of date
2022-05-17 17:46:50 -07:00
Joshua Haberman
364852e829 Throw a more helpful error if generated code is out of date, and fixed two reference leaks. 2022-05-17 22:51:01 +00:00
deannagarcia
22067bf523
Merge pull request #9979 from deannagarcia/fixProtocRelease
Fix protoc_release target
2022-05-17 13:35:43 -07:00
Deanna Garcia
0f3ee3b625 Fix protoc_release target 2022-05-16 22:48:41 +00:00
Joshua Haberman
cf4075ac20
Merge pull request #9969 from johnnyshields/21.x-ruby-x64-mingw-ucrt-support
21.x Backport: Ruby: Support x64-mingw-ucrt platform
2022-05-16 13:34:50 -07:00
Joshua Haberman
375b984715
Merge pull request #9976 from haberman/update-upb
Fixed win32 build and fixed str(message) on all Windows platforms.
2022-05-16 13:34:19 -07:00
Joshua Haberman
8353e19756 Updated to the newest upb, which brings many fixes for Windows builds. 2022-05-16 17:10:27 +00:00
Deanna Garcia
d3edfa29b7 Use osx-aarch_64 artifact 2022-05-16 16:44:24 +00:00
johnnyshields
abe77ae13e Backport: Ruby: support x64-mingw-ucrt platform, which is the new platform which Windows Ruby Installer uses as of Ruby 3.1 2022-05-14 11:41:32 +09:00
deannagarcia
380a9104b0
Merge pull request #9962 from protocolbuffers/21.x-202205131655
Update version.json to: 21.0-dev
2022-05-13 10:59:04 -07:00
Deanna Garcia
08473bbe26 Update version.json to: 21.0-dev 2022-05-13 16:56:18 +00:00
Deanna Garcia
bb7e5824b2 Pin googleapis-common-protos to most recent version 2022-05-12 20:39:50 +00:00
Deanna Garcia
43b1427c18 Update python doc gen versions 2022-05-12 18:12:55 +00:00
Deanna Garcia
20d9a4fed5 Update protoc version for doc publishing 2022-05-12 17:34:06 +00:00
Deanna Garcia
e9987578ac Update protoc version for doc publishing 2022-05-12 17:31:31 +00:00
Deanna Garcia
3cede25cef change configure.ac to use c++ version 2022-05-10 23:41:41 +00:00
Deanna Garcia
9a31dea61e update changelog 2022-05-10 18:57:45 +00:00
Protobuf Team
d259bd3287 Updating version.json and repo version numbers to: 21.0-rc1 2022-05-10 11:34:07 -07:00
Protobuf Team
bf5e800447 Updating version.json to: 22-dev 2022-05-10 11:34:06 -07:00