Commit Graph

9281 Commits

Author SHA1 Message Date
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
Jason Lunn
6b2627718b Add JRuby 9.3.4.0 to Dockerfile and use it for 9.3.x testing. 2022-03-29 19:01:05 +00:00
David L. Jones
a3347c27a3
Factor out test libraries in the cmake build. (#9689)
This change adds separate libraries for common test utilities and test proto definitions, which are shared by different test targets.

Without this change, cmake fails when generating Xcode files with the error:

```
CMake Error in CMakeLists.txt:
  The custom command generating

    .../protobuf/src/google/protobuf/unittest_lite.pb.cc

  is attached to multiple targets:

    tests
    lite-test
    lite-arena-test

  but none of these is a common dependency of the other(s).  This is not
  allowed by the Xcode "new build system".
```
2022-03-29 11:48:16 -07:00
Jon Skeet
9f597a4c59 Add regression test for https://github.com/protocolbuffers/protobuf/issues/9526 2022-03-29 16:38:30 +01:00
Jon Skeet
afb0ca40b3 Change C# editor config to use LF by default 2022-03-29 16:38:30 +01:00
Jon Skeet
e1e9d3e6da Normalize all C# and .proto files to LF
This commit should have no non-whitespace changes

Fixes #9526 (in terms of content)
2022-03-29 16:38:30 +01:00
mkruskal-google
43bb1bfe42
Merge pull request #9692 from mkruskal-google/master
Reverting change to target frameworks that breaks kokoro
2022-03-28 21:00:10 -04:00
Jason Lunn
3dee6efa54
Merge pull request #9690 from JasonLunn/format_jruby_with_google-java-format
Run all JRuby source files through `google-java-format.`
2022-03-28 20:44:28 -04:00
Jason Lunn
615a8d99f8
Merge pull request #9691 from JasonLunn/fix_warnings
Cleanup warnings seen when running tests.
2022-03-28 20:43:49 -04:00
mkruskal-google
a114b008a2 Reverting change to target frameworks that breaks kokoro 2022-03-28 16:25:46 -07:00
Jason Lunn
d0fc2794c4 Cleanup warnings seen when running tests. 2022-03-28 19:00:18 -04:00
Jason Lunn
5b28ae70c0 Run all JRuby source files through google-java-format. 2022-03-28 18:58:54 -04:00
Jason Lunn
8e7f936696
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.
2022-03-28 18:43:53 -04:00
Jensaarai
b5a35bcc7e Add C# .editorconfig to Makefile.am 2022-03-26 06:54:27 +00:00
Jensaarai
fb6016eaed Add .editorconfig for csharp directory
Nicer experience for e.g. VS Code
2022-03-26 06:54:27 +00:00
Darly Paredes
7f9f75f30e
Merge pull request #9679 from darly/3.20.x-202203251917
3.20.0
2022-03-25 16:14:44 -04:00
Darly Paredes
25045e3f69 Update protobuf version 2022-03-25 19:20:51 +00:00
Jensaarai
10df21ed5e Add .NET 6 target to Google.Protobuf test projects
* .NET 5 reaches end-of-support in May, so update the Benchmarks project
to `net6.0`
* Update some NuGet packages to latest.
2022-03-25 14:14:15 +00:00
Joshua Haberman
bc799d78f8
Added missing files and fixed file roles. (#9672) 2022-03-24 11:51:33 -07:00
David L. Jones
236d04c5b4
Merge pull request #9669 from dlj-NaN/sync-stage
Integrate from Piper for C++, Java, and Python

Note that this renames several source files under src/google/protobuf/compiler.
2022-03-24 10:25:14 -07:00
David L. Jones
75418a54ae Update ignored file paths after renaming. 2022-03-23 18:11:56 -07:00
David L. Jones
b012ef28b9 Regenerate cmake file lists. 2022-03-23 18:10:27 -07:00
David L. Jones
d06af454b5 Regenerate BUILD file lists 2022-03-23 17:44:58 -07:00
David L. Jones
40db3dabf0 Sync from Piper @436871048
PROTOBUF_SYNC_PIPER
2022-03-23 17:36:26 -07:00
Darly Paredes
744baa96ec
Merge pull request #9665 from darly/sync-stage
Integrate from Piper for C++, Java, and Python
2022-03-23 15:50:26 -04:00
Darly
d255f09036 Adding missing python files to the Makefile.am 2022-03-23 12:26:51 -04:00
Trent Houliston
85cb72481c
Fix invalid dependency manifest when using descriptor_set_out (#9647)
* Fix invalid dependency manifest when using `descriptor_set_out`

* Put the descriptor file in the temp directory so it gets deleted
2022-03-23 07:14:17 -07:00
Jason Lunn
80308c85a1
Merge pull request #9637 from JasonLunn/fix_9507
Fix NPE during encoding and add regression test for issue 9507.
2022-03-22 20:03:31 -04:00
Elliotte Rusty Harold
575d56bf85
sync JUnit version (#9662) 2022-03-22 21:54:53 +00:00
Darly Paredes
8e3746559d Merge tag 'refs/tags/sync-piper' into sync-stage 2022-03-22 18:02:12 +00:00
Darly Paredes
a4c9effec1 Sync from Piper @436517178
PROTOBUF_SYNC_PIPER
2022-03-22 18:02:10 +00:00
Elliotte Rusty Harold
8c170146ee
download_data.sh no longer exists (#9661)
@haberman download_data.sh doesn't seem to exist any more and I can't find it in the git log
2022-03-22 16:33:10 +00:00
James Newton-King
e5ae3bb763
[C#] Update GetExtension to support getting typed value (#9655) 2022-03-22 08:56:39 +00:00
Adam Cozzette
405913c712
Merge pull request #9652 from acozzette/sync-stage
Integrate from Piper for C++, Java, and Python
2022-03-21 16:37:07 -07:00
Joshua Haberman
dbb9619a9d
Cherry-pick to get Ruby 3.1 support in protobuf 3.20.0 (#9657)
* Allow pre-compiled binaries for ruby 3.1.0 (#9566)

* Allow pre-compiled binaries for ruby 3.1.1

* add comment

* fix build and use ruby 3.1.0

* add ruby31 to build CI for tests and release

* trying to fix ci

* install ruby 3.1.0 in ruby_build_environment.sh

* use head for rvm to install 3.1.0

* just install master version of rvm in prepare_build_macos_rc

* force install of master rvm in ruby_build_environment.sh

* Use coroutine=universal when compiling ruby31

* use ucontext

* fix filename

* fix coroutine name

* use git head for rake-compiler-dock

* use newest rake-compiler-dock version

* Updated CHANGES.txt for Ruby changes.

* Fixed Ruby 3.1 tests by marking intersect? as unimplemented. (#9645)

* Fixed Ruby 3.1 tests by marking intersect? as unimplemented.

* Updated compatibility tests.

Co-authored-by: Marco Concetto Rudilosso <marcoconcettorudilosso@gmail.com>
2022-03-21 15:26:27 -07:00
yeqown
a69354f31b
apply a registration for protoc-gen-fieldmask extension (#9646)
* Update options.md

* add one blank line
2022-03-19 08:46:51 -07:00
Adam Cozzette
db80d59966 Add new Python file to Makefile.am 2022-03-18 22:44:31 +00:00
Adam Cozzette
d2256ed112 Fix warning about unused variable in unit test 2022-03-18 22:34:06 +00:00