Commit Graph

8375 Commits

Author SHA1 Message Date
David L. Jones
24935638ea
Revert "Merge branch 'kotlin' into master" (#8622)
This reverts commit 716621a222, reversing
changes made to f0da89d8b6.
2021-05-17 14:26:10 -07:00
Dennis Shao
716621a222
Merge branch 'kotlin' into master 2021-05-17 15:58:53 -05:00
Dennis Shao
45aca8d7a0 Update pom.xml for kotlin doc generateor 2021-05-17 20:56:02 +00:00
Adam Cozzette
65abb64e73
Fixed syntax errors in bswap_64 (#8613)
It looks like some syntax errors were introduced by mistake because some
left parentheses were changed to curly braces without the right parens
being changed accordingly. This fixes #8611.
2021-05-17 10:38:40 -07:00
Jan Tattermusch
f0da89d8b6
Merge pull request #8473 from Jensaarai/ReadOnlySpan
C#: Add ParseFrom/MergeFrom ReadOnlySpan<byte>
2021-05-17 12:52:57 +02:00
Joshua Haberman
7e95c64dfb
[PHP] Fixed $msg->setMessage(null) to properly clear the message. (#8472)
* [PHP] Fixed $msg->setMessage(null) to properly clear the message.

Fixes: https://github.com/protocolbuffers/protobuf/issues/8457

* Changed pure PHP to throw TypeError, and added a test for null.

* Added more tests and fixed null in setter for oneof.
2021-05-14 16:48:45 -07:00
Deanna Garcia
879bc6f6db Get rid of merging tags 2021-05-14 23:44:53 +00:00
Deanna Garcia
d0ea861a74 Add another file to Makefile 2021-05-14 23:21:52 +00:00
Deanna Garcia
f1b0d4e29f Add another header to Makefile 2021-05-14 23:08:04 +00:00
Deanna Garcia
7a1b30166f Add headerfiles to Makefile 2021-05-14 22:58:57 +00:00
Deanna Garcia
cab253ec5e Removing python_protobuf.h/cc 2021-05-14 22:35:38 +00:00
Deanna Garcia
6da55b2d6b Add changes to CHANGES.txt 2021-05-14 22:20:48 +00:00
Deanna Garcia
f66dea481d Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
#	src/google/protobuf/repeated_field_unittest.cc
2021-05-14 21:56:03 +00:00
Deanna Garcia
094d18944e Sync from Piper @373871284
PROTOBUF_SYNC_PIPER
2021-05-14 21:55:47 +00:00
Deanna Garcia
380e352b0b Sync from Piper @373820256
PROTOBUF_SYNC_PIPER
2021-05-14 17:50:31 +00:00
deannagarcia
361ac449d6
Merge pull request #8597 from deannagarcia/updateKotlinCompiler
Updating Kotlin compiler version and testing new functionality it allows
2021-05-14 10:41:02 -07:00
Deanna Garcia
8fbfa35330 Merge branch 'master' into updateKotlinCompiler 2021-05-14 16:51:46 +00:00
Twig
c7d2a97879
Sets SKIP_INSTALL to YES for the ProtocolBuffers target (#8560) 2021-05-14 12:17:42 -04:00
Thomas Van Lenten
23fd8e0791 Use correct enum values.
The clang Xcode 12.5 seems to actually detect this long standing mistake.
2021-05-14 11:48:54 -04:00
Joshua Haberman
b0d90e3abe
Fixed PHP memory leaks and arginfo errors (#8614)
* Fixed a bunch of incorrect arginfo and a few incorrect error messages.

* Passes mem check test with no leaks!

* WIP.

* Fix build warning that was causing Bazel build to fail.

* Added compatibility code for PHP <8.0.

* Added test_valgrind target and made tests Valgrind-clean.

* Updated Valgrind test to fail if memory leaks are detected.

* Removed intermediate shell script so commands are easier to cut, paste, and modify.

* Passing all Valgrind tests!

* Hoist addref into ObjCache_Get().

* Removed special case of map descriptors by keying object map on upb_msgdef.

* Removed all remaining RETURN_ZVAL() macros.

* Removed all explicit reference add/del operations.

* Added REFCOUNTING.md to Makefile.am.
2021-05-13 23:16:49 -07:00
Deanna Garcia
a36efdefa3 Merge branch 'master' into updateKotlinCompiler 2021-05-13 22:47:03 +00:00
John M Duffy
63d2aca3b5
Update generated_message_table_driven.h (#8571)
Export SerializeInternalToArray referenced by TableSerializeToArray
2021-05-13 12:22:24 -07:00
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