Commit Graph

8504 Commits

Author SHA1 Message Date
Twice
9344e0b724
Fix compile error on darwin GCC due to an unsupported attribute init_priority (#8600) 2021-05-13 11:50:54 -07:00
Adam Cozzette
7bbfd14b7f
Merge pull request #8603 from acozzette/merge-3.17.x
Merge 3.17.x into master
2021-05-13 08:59:12 -07:00
Adam Cozzette
086aa97385 Merge branch '3.17.x' into merge-3.17.x 2021-05-12 16:26:13 -07:00
Adam Cozzette
652d99a8ee
Update protobuf version (#8606) 2021-05-12 16:20:18 -07:00
Deanna Garcia
92e504e660 Merge remote-tracking branch 'upstream/master' into updateKotlinCompiler 2021-05-12 21:58:09 +00:00
Adam Cozzette
ca295506c5
Make the dist_install test use Java 8 (#8609)
This is necessary because the Kotlin support requires Java 8 or
higher.

Making this test use Java 8 required switching it to the java_stretch
Docker image and updating that image to include some Python
dependencies.
2021-05-12 14:42:15 -07:00
Deanna Garcia
4a5e765fe3 Adding more repeated extension tests 2021-05-12 17:50:59 +00:00
Joshua Haberman
45e9707871
Some more updates to PHP testing infrastructure (#8576)
* WIP.

* Added build config for all of the tests.

* Use ../src/protoc if it is available, for cases where Bazel isn't available.

* Added test_php.sh.

* Fix for the broken macOS tests.

* Move all jobs to use php80 instead of lots of separate jobs.

* Only pass -t flag if we are running in a terminal.

* Updated php_all job to use new Docker stuff.
2021-05-12 10:42:16 -07:00
Adam Cozzette
0aabf89420 Remove some redundant language prefixes from the changelog for 3.17 2021-05-12 09:58:30 -07:00
Adam Cozzette
5a9367ac57 Update tests.sh to skip the Kotlin tests on Oracle 7 2021-05-12 09:58:30 -07:00
Adam Cozzette
a4866d34f9 Updated .gitignore to include Kotlin directories 2021-05-12 09:58:30 -07:00
Yuriy Chernyshov
ca7f54aa1a
Fix -Wunused-parameter in java_names.h (#8601)
* Fix -Wunused-parameter in java_names.h

* Apply review comments
2021-05-11 14:58:29 -07:00
Adam Cozzette
3133828c7f Merge branch '3.17.x' into merge-3.17.x 2021-05-11 10:50:07 -07:00
Jan Tattermusch
a84686c662
Merge pull request #8594 from jtattermusch/csharp_mark_generated_code
Mark C# generated code with System.CodeDom.Compiler.GeneratedCode as well
2021-05-11 11:24:04 +02:00
Jan Tattermusch
829b201af9 address review comments 2021-05-11 10:49:32 +02:00
Adam Cozzette
f807c02226
Update protobuf version to 3.17.0-rc2 (#8586)
* Update protobuf version

* Updated Kotlin versions and updated script to handle them
2021-05-10 15:31:35 -07:00
Deanna Garcia
cf234cf132 Updating Kotlin compiler version and testing new functionality it allows 2021-05-10 22:11:04 +00:00
Yuriy Chernyshov
90d4f31438
Fix newly appeared -Wunused-parameter (#8587)
This is #8584 applied to 3.17.x
2021-05-10 13:50:15 -07:00
Adam Cozzette
3546d29a00
Add the kotlin and kotlin-lite directories to the main pom.xml (#8585)
* Add the kotlin and kotlin-lite directories to the main pom.xml

* Updated Kotlin versions to 3.17.0-rc1

* Fix Mac CI tests by resolving brew package conflict
2021-05-10 13:36:33 -07:00
Jan Tattermusch
77a64e7dfe regenerate protos 2021-05-10 15:13:50 +02:00
Jan Tattermusch
5ae7f692f3 mark generated code with System.CodeDom.Compiler.GeneratedCode as well 2021-05-10 15:13:32 +02:00
Yuriy Chernyshov
465acaab66
Use template Delete<> for invoking a dependent template (#8579)
This fixes MSVC (tested on MSVC2019 / 16.8) compilation error (line number is different, as I am working with protobuf 3.15.8:
```
google/protobuf/map_entry_lite.h:527: error C2760: syntax error: unexpected token ')', expected 'expression'
```

I believe [this](https://stackoverflow.com/questions/34696351/template-dependent-typename) explains why MSVC considers this to be a dependent template.
2021-05-07 13:37:11 -07:00
Adam Cozzette
9b3b65ecfb
Merge pull request #8582 from acozzette/merge-3-17-x
Merge 3.17.x into master
2021-05-07 13:36:32 -07:00
Adam Cozzette
e211ad3300
Updated CHANGES.txt and PHP changelog for 3.17.0 (#8583) 2021-05-07 11:34:04 -07:00
Adam Cozzette
540852f4c6 Merge branch '3.17.x' into merge-3-17-x 2021-05-07 11:05:18 -07:00
Adam Cozzette
80df7760aa
Merge pull request #8581 from acozzette/merge-3-16-x
Merge 3.16.x into master branch
2021-05-07 10:55:31 -07:00
Adam Cozzette
7025f37cde
Update protobuf version (#8575) 2021-05-07 09:51:15 -07:00
Adam Cozzette
d0c4c409ef Merge branch '3.16.x' into merge-3-16-x 2021-05-07 09:36:06 -07:00
Adam Cozzette
3b08c721b8
Comment out unused variable in repeated_field_unittest.cc (#8578)
The test assertion is commented out, but this is causing some warnings
about an unused variable. This commit comments out the variable to fix
that problem.
2021-05-07 08:32:35 -07:00
Adam Cozzette
2dc747c574
Update PHP release notes and update version to 3.16.0 (#8573)
* Updated PHP release notes in packages.xml

* Update protobuf version to 3.16.0
2021-05-06 12:50:11 -07:00
Daniel Azuma
7e3bbeda92
fix(ruby): Fix crash when calculating Message hash values on 64-bit Windows (#8565)
* fix(ruby): Fix crash when calculating Message hash values on 64-bit Windows

* Better mapping for values outside the fixnum range

* Simpler downcasting of hash values

* Fix precedence

* Fix bundle on Ruby 2.4
2021-05-06 09:45:11 -07:00
Yuriy Chernyshov
c8389f8ed5
Fix constness issue detected by MSVC standard conforming mode (#8568)
This is the continuation of #8344
2021-05-06 09:09:22 -07:00
Jensaarai
1252f3e147 More Code Review Updates
* Add more testing for ReadOnlySpan parsing
  * Update `AssertReadFromParseContext` to also run assertions for a
`ParseContext` initialized from a `ReadOnlySpan` of the given input.
* Remove passing `ReadOnlySpan` parameters by ref since they are not
altered and the type isn't large enough to benefit from performance
improvements for passing by `ref` or `in`
* Update `ParseContext` `Initialize` overloads for
`ReadOnlySpan<byte>`, going down to two (since nothing was calling the
overload that changed the recursion limit). The first now calls the
second to set the `buffer` and `state` on the context, and has
documentation to note that it is used to create a `ParserInternalState`
with default settings.
2021-05-05 19:52:31 -07:00
Daniel Azuma
414aca5f13
fix(ruby): Fix various exceptions in Ruby on 64-bit Windows (#8563)
* fix(ruby): Fix various exceptions in Ruby on 64-bit Windows.

Activates the secondary ObjectCache map on this platform, to prevent weak keys from being garbage collected. This happened on 64-bit Windows because pointers don't necessarily fit in a Fixnum, and were being represented as GC-able Bignums on that platform.

* Removed extraneous code, and used VALUE instead of intptr_t

* Call the C function for new object instance rather than evaling a Ruby string
2021-05-05 15:42:25 -07:00
Dennis Shao
b0f4462ef2
Merge pull request #8536 from shaod2/update-python-docs-script
Update kokoro/docs/publish-python.sh
2021-05-05 16:47:31 -05:00
Adam Cozzette
debc03dfc5
Update protobuf version to 3.16.0-rc2 (#8556)
* Update CHANGES.txt

* Update protobuf version
2021-05-05 13:25:54 -07:00
Adam Cozzette
f98b287125
Remove Python compatibility tests (#8570) 2021-05-05 13:02:38 -07:00
Joshua Haberman
5df4c2ec94
Merge pull request #8546 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2021-05-04 17:14:33 -07:00
Joshua Haberman
2bf63f5983 Removed file that was mistakenly re-introduced. 2021-05-04 15:50:02 -07:00
Joshua Haberman
753a2b76ee Merge branch 'master' into sync-stage 2021-05-04 15:49:27 -07:00
Joshua Haberman
8b87075924
Updated and simplified PHP testing structure (#8558)
* Simplified PHP testing setup.

- Consolidated on a single autoloader, created by composer.
- Consolidated on a single phpunit invocation strategy: we run
  phpunit on a directory, which will run all tests matching *Test.php
  in that directory.
- We now rely on autoloading to import all test protos. require_once()
  calls for test protos are removed.
- For now the valgrind tests are removed. A follow-up PR will re-enable
  them in a more robust way.

* More improvements to PHP testing.

1. Replace custom PHPUnit-selection logic in test.sh with generic
   composer version selection.
2. Optimized both test proto generation and the custom extension
   build to avoid unnecessary work when the files are already up
   to date.

* Added assertions to verify that the C test doesn't use PHP sources.

* Updated tests.sh for the new PHP testing commands.

* Removed obsolete rules from tests.sh.

* Fixed generate_test_protos.sh for when tmp does not exist.

Also removed undefined_test.php and fixed Makefile.am.

* Added php8.0_all again which is still used.

* Added missing file to Makefile.am.

* Re-added php_all_32 rule which is also still used.

* Updated testing commands for macOS and download composer.

* Use /usr/local/bin on mac instead of /usr/bin, since the latter is not writable.
2021-05-04 10:19:22 -07:00
Paul Yang
114efc42d4
Fix php json parsing not throwing error for unknown field. (#8528) 2021-05-04 10:09:56 -07:00
Jan Tattermusch
2f0e269725 improve readability of MessageParsingHelpers 2021-05-04 11:39:15 +02:00
Jan Tattermusch
89244fe167 make public API take ReadOnlySpan<byte> without "ref" 2021-05-04 11:24:55 +02:00
James Yuzawa
55109ea3da
protoc-java: reuse osx-x86_64 for osx-aarch_64
Signed-off-by: James Yuzawa <jtyuzawa@gmail.com>
2021-05-03 20:39:03 -04:00
Adam Cozzette
17b0fb9149
Make update_version.py compatible with Python 3 (#8555) 2021-05-03 16:26:59 -07:00
Yuriy Chernyshov
28101c3e39
Stop using GG_ prefixed macros (#8539)
* Stop using GG_ prefixed macros

GG_ULONGLONG was renamed to PROTOBUF_ULONGLONG some time ago

* Better
2021-05-03 15:05:02 -07:00
Jensaarai
5095b68183 Code Review Feedback
* Move additional `ReadOnlySpan<byte>` `ParseContext` overloads next to
the existing overload
* Pass `ReadOnlySpan<byte>` parameters by `ref`
* Update `MessageParsingHelpers` to add checks for parsing from
`ReadOnlySpan<byte>`, remove tests from `CodedInputStreamTest`
2021-05-03 12:03:22 -07:00
Kenneth Lum
952cf14442
fix typo (#8548) 2021-05-03 11:21:59 -07:00
Joshua Haberman
67044a2820 Reinstate the Python change that was somehow reverted in the sync. 2021-04-30 16:28:12 -07:00