Commit Graph

8760 Commits

Author SHA1 Message Date
deannagarcia
12f70b7c4d
Merge pull request #8122 from mamapanda/MessageToDict-fix
Make MessageToDict convert map keys to strings
2021-10-14 11:12:34 -07:00
deannagarcia
3d223dc5c5
Merge pull request #8232 from qnighy/arm64-darwin
Ruby: build extensions for arm64-darwin
2021-10-14 11:05:52 -07:00
deannagarcia
ed58b7d26b
Merge pull request #8562 from mcclymont/timestamp-from-time-class-method
Add class method Timestamp.from_time to ruby well known types
2021-10-14 11:01:11 -07:00
Shigeo Hashimoto
25180ac9b6
Fix build failed for visual studio in multi-byte windows environments (#7235)
* Set source and executable charset to utf-8 when Visual Studio

* Remove unnecessary version check for visual studio
2021-10-14 09:45:40 -07:00
Justin Paupore
255dec16d6
Add Android stlport and default toolchains to BUILD. (#8290)
These are additional possibilities for --crosstool_top for Android NDK
compilation. Since the NDK doesn't have -lpthread, getting these flags
wrong leads to a linker error.

Fixes: 180084220
2021-10-13 14:19:42 -07:00
Elliotte Rusty Harold
40e9cedf7a
JDK 6 is too old to care about (#9097)
@cpovirk
2021-10-13 21:12:10 +00:00
Dirk Boye
9eba6eddce
update rules_python dependency to version 0.1.0 (#8214)
other bazel libraries (e.g. rules_docker 0.15.0) require rules_python 0.1.0
or above. running protobuf_deps() before importing rules_docker
will lead to errors.

upgrading rules_python fixes this problem.
2021-10-13 13:54:54 -07:00
Adam Cozzette
f8a22b45c0
Remove references to six (#9096)
We no longer support Python 2 and therefore no longer need to depend on
six. I'm hoping this will make it possible to merge #8214.
2021-10-13 13:51:09 -07:00
miyucy
3881f49ce9
Add size to Map class (#8068) 2021-10-13 12:54:49 -07:00
Elliotte Rusty Harold
dd3a6486cc
Update versions in README files (#9093)
* update version numbers in java/README.md
* update lite too
2021-10-13 13:34:49 -04:00
Hong Xu
1ab7789f38
Emacs: Protobuf mode should be derived from prog-mode (#9076)
Prog mode is a basic major mode for buffers containing programming
language source code:
https://www.gnu.org/software/emacs/manual/html_node/elisp/Basic-Major-Modes.html

A lot of programming mode setup is based on whether the major mode is
derived from `prog-mode`.
2021-10-13 10:26:40 -07:00
Elliotte Rusty Harold
ab993cf6ca
document the kinds of patches the repo is open to (#8900)
* document the kinds of patches the repo is open to
2021-10-13 16:36:21 +00:00
Elliotte Rusty Harold
5c8018c378
Merge pull request #9092 from elharo/elharo-patch-2
deps: update maven-antrun-plugin
2021-10-13 16:35:18 +00:00
Raul Bocanegra Algarra
e47ed057a5
Make glob recursive if option is enabled (#8783) 2021-10-13 09:13:18 -07:00
Jan Tattermusch
3c8c0ae725
Merge pull request #7246 from ObsidianMinor/csharp/issue7241
Correctly set ExtensionRegistry when parsing with MessageParser, but using an already existing CodedInputStream
2021-10-13 14:45:33 +02:00
Elliotte Rusty Harold
c69b90cb06
deps: update maven-antrun-plugin
fixes #8704
2021-10-13 11:32:48 +00:00
Elliotte Rusty Harold
21873ae54a
Merge pull request #7853 from belugabehr/CopyList
Use ArrayList copy constructor
2021-10-13 11:13:06 +00:00
Postmodern
39013ab238
Remove unused rubygems-tasks development dependency (#8824)
* Cannot find any occurrence of `require 'rubygems/tasks` or `Gem::Tasks` in the source code, so I am confident that this development dependency can safely be removed.
2021-10-12 17:03:24 -07:00
Adam Cozzette
3e1967e10b
Merge pull request #9090 from acozzette/sync-stage
Integrate from Piper for C++, Java, and Python
2021-10-12 16:37:01 -07:00
Josh
8171716ae9
Added "object" as a reserved name for PHP (#8962)
* Added "object" as a reserved name for PHP

* Fixed spacing
2021-10-12 16:14:05 -07:00
Adam Cozzette
9aa1adc60c Removed unused references to easymock_classextension 2021-10-12 15:43:34 -07:00
Adam Cozzette
454f0cccaa Add jsr305 dependency for Bazel 2021-10-12 15:37:40 -07:00
Chris Povirk
0da2ca5a17
Add jsr305 to protobuf-util deps. (#9059)
This prepares for a change (internal CL 399474184, to be mirrored out to GitHub) to add a few such annotations in FieldMaskUtil and JsonFormat.

(Technically, this PR is probably not "necessary" because protobuf-util already depends transitively on jsr305. But it's better hygiene to depend on it directly, and the direct dependency could protect against problems if protobuf-util drops some of its other deps -- or if those deps drop their own deps on jsr305.)
2021-10-12 13:11:17 -07:00
Adam Cozzette
7f79a416ff Update the file lists with ./update_file_lists.sh 2021-10-12 11:49:50 -07:00
Adam Cozzette
68c17dcde8 Tweak syntax of casting function to void
GCC 4.9 seems to be unable to handle (void) syntax with a function, but
it is OK with a static_cast to void.
2021-10-12 11:12:39 -07:00
Adam Cozzette
99612d0885 Update CHANGES.txt 2021-10-12 10:21:22 -07:00
Adam Cozzette
4ffb31e906 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-10-12 10:19:11 -07:00
Adam Cozzette
1f66b1b032 Sync from Piper @402594188
PROTOBUF_SYNC_PIPER
2021-10-12 10:19:10 -07:00
Adam Cozzette
9488e2f8eb
Update cmake file lists (#9038)
I ran ./update_file_lists.sh to update these files.
2021-10-12 10:08:05 -07:00
Jason Lunn
cbe2eadd5b
Merge pull request #9087 from JasonLunn/jruby_kokoro_test_fix
Install core rather than util
2021-10-11 20:35:24 -04:00
Dietmar Scheidl
3bdcc1266b
Fix build on AIX and SunOS (#8373) (#9065)
* fix includes for AIX and SunOS
2021-10-11 13:46:54 -07:00
mgabris
1b22582bc0
Fix unused variable warnings in extension_set.h (#9073) 2021-10-11 13:39:14 -07:00
Jason Lunn
2ccc5df358 Install core rather than util 2021-10-11 19:10:09 +00:00
Elliotte Rusty Harold
b7928164dc
Merge pull request #9066 from elharo/testscope
EasyMock should have scope test
2021-10-11 19:07:41 +00:00
Elliotte Rusty Harold
9650e9fe8f
update to 3.18.1 (#9057)
* update to 3.18.1
2021-10-10 11:11:21 +00:00
Jimmy Yuen Ho Wong
ae4fd1e24b
Fix cl deprecation warning (#9046) 2021-10-09 11:54:15 -07:00
johanmoe
15c63ad850
Fix build error with MinGW (#9077)
Fixes:
  * zero_copy_stream_impl.cc uses F_GETFL when build with MinGW,
    which isn't defined under Windows.
2021-10-09 11:45:56 -07:00
NexusNull
5142e362bc
Update README.md (#9078)
remove dollar sign for easier copying
2021-10-09 11:42:59 -07:00
Alexey Solodkiy
fd5202b6cd
Add twirp to RPC Implementations list (#9085) 2021-10-09 11:39:18 -07:00
Adam Cozzette
3afc828309 Sync from Piper @401883098
PROTOBUF_SYNC_PIPER
2021-10-08 16:45:26 -07:00
Jason Lunn
ad717db556
Merge pull request #9082 from JasonLunn/jruby_add_test_targets
Add JRuby test targets for 9.2.x and 9.3.x.
2021-10-08 09:01:46 -04:00
Jason Lunn
b79a2f242c Add JRuby test targets for JRuby 9.2.x and 9.3.x.
Standardize on JRuby 9.2.19.0 for building and for testing the 9.2.x branch.
2021-10-07 18:56:14 -04:00
Jason Lunn
728878e98f Add JRuby test targets for JRuby 9.2.x and 9.3.x.
Standardize on JRuby 9.2.19.0 for building and for testing the 9.2.x branch.
2021-10-07 18:45:38 -04:00
Jason Lunn
9e49f0f46b
Merge pull request #9081 from JasonLunn/jruby_update_ruby_docker
Update the base image from jessie to stretch (for parity with the Java).
2021-10-07 21:16:18 +00:00
Jason Lunn
eee60cec13 Update the base image from jessie to stretch (for parity with the Java).
Add Maven and OpenJDK 8 and add JRuby 9.2.x and 9.3.x.

Replace keys.gnupg.net with keyserver.ubuntu.com as the GPG keyserver since the former no longer exists.
2021-10-07 20:28:20 +00:00
Jason Lunn
b7cc13068d
Merge pull request #9071 from JasonLunn/jruby_explicit_java_dependency
Create an explicit build dependency from JRuby on Java
2021-10-07 13:50:44 +00:00
Jason Lunn
803a8cb9c7
Merge pull request #9074 from elharo/elharo-patch-1
remove dependency on Jackson
2021-10-07 00:01:55 +00:00
Jason Lunn
0d3f95d7ae Narrow the scope of the install 2021-10-06 17:27:43 -04:00
Elliotte Rusty Harold
174d95c1a7
remove dependency on Jackson 2021-10-06 21:02:51 +00:00
Jason Lunn
2ed8173481 Bug fix for oracle7 regression 2021-10-06 16:40:09 -04:00