Commit Graph

8774 Commits

Author SHA1 Message Date
Joshua Haberman
ef8d418fad
Merge pull request #9030 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2021-09-28 21:15:29 -07:00
Masaki Hara
f2b5c33baf Specify aarch64 for older autotools 2021-09-29 11:51:11 +09:00
Masaki Hara
4111d50488 Merge branch 'master' into arm64-darwin 2021-09-29 11:50:23 +09:00
Joshua Haberman
a3d24e34a9 Added new files to Makefile.am. 2021-09-28 22:38:35 +00:00
Joshua Haberman
82deebfa7a Added new Java Lite files to BUILD/pom.xml. 2021-09-28 22:25:19 +00:00
deannagarcia
c57ee04cf3
Merge pull request #9029 from protocolbuffers/toolchain
Change tool paths for docker
2021-09-28 13:10:19 -07:00
Josh Haberman
5a77804106 Added changelog entries from google3. 2021-09-28 20:01:39 +00:00
Deanna Garcia
3a493ffae5 Change tool paths for docker 2021-09-28 19:54:14 +00:00
deannagarcia
bc23dfe314
Merge pull request #9028 from protocolbuffers/toolchain
Changing clang path in toolchain
2021-09-28 12:19:20 -07:00
Deanna Garcia
d1a1818898 Changing clang path 2021-09-28 18:24:37 +00:00
Josh Haberman
129b3e8a98 Merge branch 'master' into sync-stage 2021-09-28 15:28:48 +00:00
Joshua Haberman
567efd4c3e
Merge pull request #9026 from haberman/merge-release
Merge 3.18.x release branch to master
2021-09-27 17:55:39 -07:00
deannagarcia
72c76f3ffc
Merge pull request #9027 from protocolbuffers/toolchain
Changing directory of clang to match docker container
2021-09-27 17:46:24 -07:00
Deanna Garcia
5e62362a09 Changing directory of clang to match docker container 2021-09-27 22:45:46 +00:00
Joshua Haberman
31980b3f6c Corrected the labels for CHANGES.txt. 2021-09-27 15:31:41 -07:00
Joshua Haberman
2128ce074f Merge branch '3.18.x' into merge-release 2021-09-27 15:29:06 -07:00
Josh Haberman
28c52fd5c4 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-09-27 19:18:42 +00:00
Josh Haberman
624d29d833 Sync from Piper @399250367
PROTOBUF_SYNC_PIPER
2021-09-27 19:18:41 +00:00
deannagarcia
c86071c9d0
Merge pull request #9024 from protocolbuffers/toolchain
Changing format of features
2021-09-27 10:44:18 -07:00
Joshua Haberman
bf8d7f0b72
Merge pull request #9023 from haberman/dyn-msg-perf-fix
Performance fix for DynamicMessage: force GetRaw() to be inlined.
2021-09-25 08:18:15 -07:00
Deanna Garcia
2a2c9767ac Changing format of features 2021-09-24 23:34:31 +00:00
Joshua Haberman
5e8396fd27 Performance fix for DynamicMessage: force GetRaw() to be inlined. 2021-09-24 15:17:30 -07:00
deannagarcia
257146364d
Merge pull request #9022 from protocolbuffers/toolchain
Remove config suffix from .bazelrc configs
2021-09-24 13:38:57 -07:00
Deanna Garcia
25b1945fae Remove config suffix from .bazelrc configs 2021-09-24 20:22:37 +00:00
Adam Cozzette
151e632bac Fix dist install test by ensuring that we use Python 3 (#9011)
* Fix dist install test by ensuring that we use Python 3

Now that we have dropped Python 2 support, we need to make sure this
install test uses Python 3.

* Update Docker image to install Python 3 version of setuptools

* Run pip3 instead of pip
2021-09-24 12:30:58 -07:00
AN Long
2fffff8320 Add python-requires in setup.py (#8989)
* Add python-requires in setup.py

* Update setup.py
2021-09-24 12:30:46 -07:00
Thomas Van Lenten
5d5bc234ea Move some common code into a helper. 2021-09-24 13:22:10 -04:00
Oleg Golberg
cb7be38519
Add Protokt to the list of 3rd party implementations (#7169) 2021-09-24 09:41:06 -07:00
Thomas Van Lenten
57da2b45ae Update some types to be more current. 2021-09-24 11:01:19 -04:00
Adam Cozzette
1288d1ee2d
Fix dist install test by ensuring that we use Python 3 (#9011)
* Fix dist install test by ensuring that we use Python 3

Now that we have dropped Python 2 support, we need to make sure this
install test uses Python 3.

* Update Docker image to install Python 3 version of setuptools

* Run pip3 instead of pip
2021-09-23 15:08:32 -07:00
Prawn
8c39a1c4fd
An additional range so we can have FieldOptions, MessageOptions, EnumOptions, FileOptions, and OneOfOptions (#9012) 2021-09-23 14:09:32 -07:00
deannagarcia
2a5bf40b37
Merge pull request #9010 from protocolbuffers/toolchain
Creating bazel toolchain to crosscompile with
2021-09-23 12:52:46 -07:00
Thomas Van Lenten
c4e0deddb9 Add two new generation options around objc prefix usage.
- `require_prefixes`: Fail generation if a file doesn't have the option.
- `prefixes_must_be_registered`: If a prefix is in a file, it must be registered
  in the expected file. There is a grey space here for files without packages as
  there is no way to register it, so these case will still warn at the moment.
2021-09-23 12:15:59 -04:00
AN Long
b75bb09551
Add python-requires in setup.py (#8989)
* Add python-requires in setup.py

* Update setup.py
2021-09-22 15:09:39 -07:00
johanmoe
06c8cbea59
Fix cmake install for protoc component (#8994)
Fixes:
  * RUNTIME DESTINATION for protoc TARGET is not given a COMPONENT option
2021-09-22 14:25:29 -07:00
Deanna Garcia
b1877bb27f Style nits 2021-09-22 21:21:04 +00:00
Eddie-cz
58a7c8ab92
Update port_def.inc (#8993) 2021-09-22 14:13:17 -07:00
Vasily Fomin
8b59d5367c
Fix typo in Descriptor docstring (#9001) 2021-09-22 14:11:29 -07:00
Deanna Garcia
33f3c0ec99 Addressing first round of comments 2021-09-22 19:44:04 +00:00
Deanna Garcia
5532dae1da Creating bazel toolchain to crosscompile with 2021-09-22 18:30:53 +00:00
zhangskz
740c4b082d
Update ruby_generator.cc to allow proto2 imports in proto3 (#9003)
* Update ruby_generator.cc to allow proto2 imports in proto3, with updated unit tests

* Update Makefile.am with new ruby_generated_code_proto2_import.proto

* Fix ruby_generator unit test to use temporary test directory for imported protos

* Add test for imported proto2 to ruby/tests

* Fix proto_path, restore to ../src/protoc, and fix/cleanup unit test.

* Rename Proto2TestMessage to TestImportedMessage for consistency, for ruby compiler tests
2021-09-22 09:16:09 -07:00
Elliotte Rusty Harold
a93074e546
deps: add j2objc annotations (#9005)
* deps: add j2objc annotations

@pzd this will be needed on the next sync with google3
2021-09-22 12:41:03 +00:00
Elliotte Rusty Harold
15c40c6cda
Merge pull request #9002 from elharo/elharo-patch-1
docs: 3.18.0 is released
2021-09-21 13:50:24 +00:00
Jason Erb
8e451fa7c4
Protobuf: Fix for C5041 for VC++ >= 15.5 (#8979)
* Protobuf: Fix for C5041 for VC++ > 15.5

Introduced in 15.5: https://docs.microsoft.com/en-us/cpp/overview/cpp-conformance-improvements-2017?view=msvc-160#inline-variables
15.5 is 1912: https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-160

Issue: #8978

* Fix comment wording for #8978
2021-09-20 16:48:29 -07:00
Sil3ntStorm
32677158b4
Fix unused variable warnings outside of compiler directory (#8945) 2021-09-20 15:41:18 -07:00
Prawn
e9b977fdce
Adding an extension number for protoc-gen-jsonschema (#8999) 2021-09-20 15:17:07 -07:00
Elliotte Rusty Harold
06cfc9a0e6
docs: 3.18.0 is released 2021-09-20 16:17:31 -04:00
Elliotte Rusty Harold
2501e9b856
Merge pull request #8912 from protocolbuffers/elharo-patch-3
same directory ignore
2021-09-15 19:10:58 +00:00
Paul Yang
89b14b1d16
Update change log (#8974) 2021-09-14 09:48:28 -07:00
zhangskz
69b0a78315
Merge pull request #8968 from zhangskz/sync-stage
Integrate from Piper for C++, Java, and Python
2021-09-14 09:39:58 -07:00