Commit Graph

9268 Commits

Author SHA1 Message Date
Brent Shaffer
eb27c201f1
fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)
* fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility

* typo fix - readme > readonly
2022-04-12 15:48:14 -07:00
Matt Fowles Kulukundis
8077ac24b7
Merge pull request #9777 from noahdietz/master-to-main
Replace master with main in URLs & docs
2022-04-12 13:54:12 -04:00
noahdietz
5abf802bc2 Replace master with main in URLs & docs 2022-04-12 10:25:08 -07:00
Elliotte Rusty Harold
a85bbad379
deps: update Guava to 31.1 (#9757)
@mrkruskal
2022-04-08 18:43:11 +00:00
Adam Cozzette
9bf0aca7db
Update protobuf_deps.bzl to add a dependency on Abseil (#9752)
This is the most recent Abseil LTS branch, from November 2021. We do not
yet use Abseil for anything, but this change will make it possible to
start using it in Bazel when we're ready.
2022-04-08 09:12:05 -07:00
Vasiliy Tolstov
7ffe9402db
Add micro Registered Extension Number (#9767)
unistack-org/micro (microservices framework) uses protoc-gen-go-micro generator that has extension support for additional framework related options.

It is currently not using any registered extension number, so i want to stabilise this and i think that this is a good thing.

See here for an example of the extenstion in action.

Co-authored-by: Adam Cozzette <acozzette@google.com>
2022-04-08 09:11:27 -07:00
Jeff Sawatzky
e3b00bb58a
Add Google Gnostic Registered Extension Number (#9754)
google/gnostic's protoc-gen-openapi generator has extension support for additional openapi options.
It is [currently using `1042`](https://github.com/google/gnostic/blob/master/openapiv3/annotations.proto) which is registered with grpc-gateway's protoc-gen-openapiv2 extension which probably isn't a good thing.
See [here](https://github.com/google/gnostic/blob/master/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto) for an example of the extenstion in action.
2022-04-08 09:08:38 -07:00
mkruskal-google
85aa87cbc9
Merge 3.20.1-rc1 into main (#9760)
* Fix NPE during encoding and add regression test for issue 9507.

(cherry picked from commit 58e320a732)

* Implement `respond_to?` in RubyMessage (#9677)

All synthetic methods implemented by `method_missing` are now supported by `respond_to?`.

Fixes issue #9202.

* Fix null pointer exceptions exposed by new regression tests.
* Fix clear_ on oneofs so that it is safe to call repeatedly and so that respond_to? does not depend on whether the oneof is currently cleared.
* Code cleanup: reenable more tests on JRuby.
* Align JRuby behavior with CRuby by throwing a RuntimeError when attempting to assign to a oneof.

(cherry picked from commit 8e7f936696)

* Update protobuf version

* Merge pull request #9727 from mlocati/build-packaged-php-extension

Fix building packaged PHP extension

(cherry picked from commit 7f9901c5f6)

* Update protobuf version

* Update changelogs for 3.20.1-rc1

Co-authored-by: Jason Lunn <jason.lunn@gmail.com>
Co-authored-by: Jorg Brown <jorg.brown@gmail.com>
2022-04-07 18:33:58 -04:00
Elliotte Rusty Harold
88eb7550a6
-Dsurefire.failIfNoSpecifiedTests=false (#9761)
@mrkruskal
2022-04-07 22:10:09 +00:00
Elliotte Rusty Harold
55177c3574
-DfailIfNoSpecifiedTests=false (#9753)
@jtattermusch @mkruskal-google
2022-04-07 14:02:57 +00:00
deannagarcia
061dead753
Merge pull request #9750 from protocolbuffers/pythonBuilds
Add k8 toolchain
2022-04-06 16:33:24 -07:00
Jason Lunn
05df37d35c
Merge pull request #9722 from lucthev/main
[Ruby] Fix RepeatedField#last, #first inconsistencies
2022-04-06 17:37:22 -04:00
Luc Thevenard
d54cafb7c8 Avoid negative indexes for JRuby 2022-04-06 15:49:08 -04:00
Deanna Garcia
a8b12d5b6e Consistent formatting 2022-04-06 18:43:58 +00:00
Derek Perez
b55c8e4084
include gen_dir irrespsective of sources_dir in protoc_gen (#9735) 2022-04-06 11:35:10 -07:00
deannagarcia
5f920d1507
Merge pull request #9642 from j-min5u/remove-public-modifier-kotlin
[Kotlin] remove redundant public modifiers for compiled code
2022-04-06 11:26:17 -07:00
Deanna Garcia
b7980cd859 Removing comment 2022-04-06 17:44:20 +00:00
Deanna Garcia
9a4c48a566 Add k8 toolchain 2022-04-06 17:42:12 +00:00
Minsoo Cheong
464d626d1a Merge remote-tracking branch 'upstream/main' into remove-public-modifier-kotlin 2022-04-06 08:59:03 +09:00
mkruskal-google
7f9901c5f6
Merge pull request #9727 from mlocati/build-packaged-php-extension
Fix building packaged PHP extension
2022-04-05 12:05:32 -07:00
Thomas Van Lenten
ca30339529 Tweak how python/python3 is used.
The kokoro Mac configs seem to be pretty old without python3, tweak how things
are invoked to try and better deal with those configs.
2022-04-05 14:25:01 -04:00
Matt Fowles Kulukundis
205117c44b
Merge pull request #9738 from ronilichtman/patch-1
Remove unused `HasTopLevelEnums` function
2022-04-05 12:40:03 -04:00
Matt Fowles Kulukundis
6d068f8c6b
Merge pull request #9739 from smertnik3sh/add-getobject-def-undef
Escape GetObject macro inside protoc-generated code
2022-04-05 12:39:23 -04:00
Roni Lichtman
75dd25b0fd
Remove unused HasTopLevelEnums function
This will address the following compilation error:

```
src/google/protobuf/compiler/python/python_generator.cc:95:13: warning: unused function 'HasTopLevelEnums' [-Wunused-function]
```
2022-04-05 17:46:00 +03:00
Thomas Van Lenten
1e60bd62ed Update the mac python helper scripts to python3.
macOS 12.3 dropped shipping python2.

Update things for python3 (mostly via 2to3).
2022-04-05 10:42:12 -04:00
heretic
e1d39a744f add push/pop GetObject macro 2022-04-05 16:39:09 +03:00
Minsoo Cheong
56067d1498 Merge remote-tracking branch 'upstream/main' into remove-public-modifier-kotlin 2022-04-05 11:17:24 +09:00
Minsoo Cheong
92c11a45c6 remove public modifiers on kt variables 2022-04-05 11:16:59 +09:00
Minsoo Cheong
97533f5243 fix: restore val 2022-04-05 11:05:54 +09:00
mkruskal-google
1ac05394a5
Merge pull request #9734 from mkruskal-google/sync-stage
Integrate from Piper for C++, Java, and Python
2022-04-04 16:55:48 -07:00
Mike Kruskal
701650b7d0 Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	csharp/src/Google.Protobuf.Test/testprotos.pb
2022-04-04 13:50:21 -07:00
Mike Kruskal
a29e0e3f44 Sync from Piper @439400376
PROTOBUF_SYNC_PIPER
2022-04-04 13:42:37 -07:00
Michele Locati
f0936d26e1
Fix building packaged PHP extension 2022-04-03 21:52:03 +02:00
Michele Locati
feef319e85
Test building packaged PHP extension 2022-04-03 21:40:28 +02:00
Minsoo Cheong
82ff86cb8a Merge branch 'master' into remove-public-modifier-kotlin 2022-04-03 09:42:55 +09:00
Luc Thevenard
d85f03d66a [Ruby] Fix RepeatedField#last, #first inconsistencies 2022-04-01 17:09:22 -04:00
David L. Jones
3be07ab320
[Kokoro] Emit XML test logs on macos-next. (#9709)
This enables googletest XML output on the macos-next builders, and adds logic to collect the results.

The log collection logic is slightly complex, but it should be reusable in other contexts. The idea is to capture stdout/stderr for build steps along with googletest XML reports into a temporary directory, then stage those into paths expected for artifacts.
2022-04-01 13:49:14 -07:00
mkruskal-google
7508ae82d3
Merge pull request #9721 from mkruskal-google/3.20.x-202204011233
Merge 3.20.0 into main
2022-04-01 13:45:30 -07:00
Mike Kruskal
ffe4b0cfe6 Merge branch '3.20.x' into 3.20.x-202204011233 2022-04-01 12:34:01 -07:00
Gary Peck
eb8976a56d
Add pbandk to list of 3rd-party Kotlin libraries (#9712) 2022-03-31 10:45:15 -04:00
Elliotte Rusty Harold
61dcf50b85
Update Guava to 31.1 (#9707)
* start work on open source build instructions

* subprojects

* JDK17

* update Guava to 30.1-jre

* pin dependencies
2022-03-30 16:52:15 -04:00
David L. Jones
5b2c7b8373
[CMake] Declare remaining tests, and add a test output option. (#9705)
The new option will allow us to generate test XML output.

CTest can discover tests from googletest, but it generates one file
per case. We have several thousand cases, so one file each would be
far from optimal. The approach in this change will generate one file
per test (executable).
2022-03-30 13:44:42 -07:00
David L. Jones
0dcf31d981
Enable builds for macos-next kokoro. (#9706)
This enables build logic on the "macos-next" flavor of Kokoro tests.

The current runners use Big Sur with Xcode 13.2.1. This build uses cmake to configure and drive the build through Xcode. Tests are run under ctest.
2022-03-30 13:09:49 -07:00
Jon Skeet
9e6e4eb425 Generated code for test protos for issue #9605 2022-03-30 16:33:00 +01:00
Jon Skeet
e2f845b2f1 Test proto and unit test for issue #9605
This doesn't test *all* possibilities (e.g. the field being a
wrapper, or a message field, etc) - but I'm fairly confident that I
found all the places referring to the case.
2022-03-30 16:33:00 +01:00
Jon Skeet
81c5e1a712 C# generator: Append _ to the oneof case enum name if it's "None"
Fixes #9605 (tests in next commit)
2022-03-30 16:33:00 +01:00
Jon Skeet
d7ef9cd2ba Make it easier to follow cmake/README.md instructions
When following the instructions directly (for developing on Windows) we should end up with a generator that's easy to run for csharp/generate_protos.sh, and we shouldn't end up trying to stage the build output.
2022-03-30 16:33:00 +01:00
David L. Jones
520c601c99
Temporary Kokoro build for macos-next. (#9693)
This build will be used to troubleshoot building on a newer macOS
image. Once it is stable, this config will replace the "macos" build.
2022-03-29 14:32:10 -07:00
Jason Lunn
5b67e77876
Merge pull request #9697 from JasonLunn/jruby_9.3.4.0
Add JRuby 9.3.4.0 to Dockerfile and use it for 9.3.x testing.
2022-03-29 16:01:51 -04:00
Adam Cozzette
faa42e900c
Revert "Use repo-relative labels wherever possible (#9187)" (#9696)
This reverts commit 11de748d66.
2022-03-29 15:50:39 -04:00