Commit Graph

8796 Commits

Author SHA1 Message Date
Adam Cozzette
0e02f95b87 Fix Ruby release build by pinning rake-compiler-dock version (#9372)
Our Ruby release build broke at some point in the past day or so, and I
strongly suspect it is due to a new version (1.2.0) of
rake-compiler-dock. This commit pins the version to 1.1.0 as a temporary
fix.
2022-01-05 10:05:11 -08:00
Adam Cozzette
9057466a7a
Merge pull request #9336 from acozzette/merge-3.18.x
Merge 3.18.x into 3.19.x
2021-12-23 09:58:38 -08:00
Adam Cozzette
9227f60f85 Merge branch '3.18.x' into merge-3.18.x 2021-12-22 23:04:07 +00:00
Adam Cozzette
1fe07f9ce2
Cherry-pick fix from #9311 into 3.18.x (#9320)
* Dropped Ruby 2.4 support for CI and releases.

* Removed Kokoro configs for old Ruby versions.

* Update Dockerfile to allow it to be rebuilt

Co-authored-by: Joshua Haberman <jhaberman@gmail.com>
2021-12-22 15:01:34 -08:00
Jie Luo
cb1f49ae73
Cherry-pick Python 3.10 fix to 3.19.x (#9323) 2021-12-17 10:50:45 -08:00
Jie Luo
bb5094881c
Update python 3.10 install MD5 Sum (#9322)
https://www.python.org/downloads/release/python-3100/
2021-12-16 21:38:42 -08:00
Adam Cozzette
31dd7b71cc
Fix benchmark by making sure we use Python 3 (#9170) (#9176)
The benchmark runs have been failing since we started requiring Python
3, so this changes fixes the benchmarks by ensuring we always use Python
3.
2021-11-01 11:44:58 -07:00
Adam Cozzette
7c40b2df1f
Update protobuf version (#9167) 2021-10-28 14:07:53 -07:00
Adam Cozzette
42ff92a4d1
Merge pull request #9166 from acozzette/cherry-pick-fixes
Cherry-pick fixes for 3.19.1 and update change log
2021-10-28 13:07:03 -07:00
Adam Cozzette
1c8ae24595 Update changelog for 3.19.1
I also updated CHANGES.txt to include a couple things I forgot to add
for 3.19.0.
2021-10-28 18:09:06 +00:00
Peter Zhu
b2ac7ced50 Fix memory leak in MessageClass.encode
If the line above raises an exception, the upb_arena is lost and memory
is leaked.
2021-10-28 17:47:53 +00:00
Marnix Bouhuis
e58469bdbe JS: Fixed ReferenceError: window is not defined when getting the global object (#9156) 2021-10-28 17:46:36 +00:00
Adam Cozzette
c7dfd0d6b9
Align dependency handling with Bazel best practices (#9165)
This commit removes the use of bind() since that function goes against
Bazel best practices:
https://docs.bazel.build/versions/main/external.html#repository-rules-1
The bind() function basically maps a dependency into //external, but
there is no good reason to do this. By mapping dependencies into
//external and relying on this in our own BUILD files, we're forcing
projects that depend on us to do the same. The one bind() call that I
did leave in place was //:python_headers. This one seems to be doing
something complicated I don't fully understand, and I don't want to risk
breaking it.

This change also moves our list of required Maven artifacts into a
constant in protobuf_deps.bzl. This way, projects that depend on us can
refer to this list when they invoke maven_install() and automatically
pull in all the necesary dependencies.

This fixes #9132.
2021-10-28 10:34:54 -07:00
Adam Cozzette
67c2a92f82
Ensure that release archives contain everything needed for Bazel (#9131)
This change adds some files to EXTRA_DIST in Makefile.am so that our
published tar and zip files will have everything needed for Bazel
builds. I also added a basic test for this so that next time we should
find out sooner if we're missing any important files.

This should fix #9129.
2021-10-21 06:47:17 -07:00
Adam Cozzette
17b30e9647
Update protobuf version (#9119) 2021-10-20 10:14:02 -07:00
Joshua Haberman
912eb8b89e
Merge pull request #9121 from haberman/rubyfix
Fix for descriptor_pb.rb: google/protobuf should be required first.
2021-10-19 17:14:26 -07:00
Joshua Haberman
bb5a2684de Minor whitespace fixes and test fixups. 2021-10-19 16:21:24 -07:00
deannagarcia
51cb7f99d7
Merge pull request #9120 from protocolbuffers/kotlinInlining
Fixing inlining and deprecation for repeated string fields in kotlin
2021-10-19 15:21:52 -07:00
Joshua Haberman
4c445b1803 Fix for descriptor_pb.rb: google/protobuf should be required first. 2021-10-19 14:51:52 -07:00
Deanna Garcia
ad9eb238cc Fixing formatting 2021-10-19 21:36:30 +00:00
Deanna Garcia
33113ce9f9 Fixing inlining and deprecation for repeated string fields in kotlin 2021-10-19 21:34:32 +00:00
Adam Cozzette
3f3e6f47c6
Update version to 3.19.0-rc2 and fix changelog about Java 7 (#9116)
* Update protobuf version

* Update CHANGES.txt to reflect that we're not yet dropping Java 7
2021-10-19 09:01:57 -07:00
Adam Cozzette
53a1d66d9d
Update PHP release notes for 3.19.0 (#9110) 2021-10-15 15:35:27 -07:00
Adam Cozzette
d1c6620347 Update CHANGES.txt for 3.19.0 2021-10-15 15:21:08 -07:00
Adam Cozzette
8a0aa4b372
Update Mac test runs to download RVM directly from GitHub (#9107)
Our Mac test runs recently started failing to download RVM. The issue
appears to be a combination of an SSL certificate expiring and old
OpenSSL versions having a bug preventing them from validating the
replacement certificate: https://github.com/rvm/rvm/issues/5133

This commit works around the problem by downloading RVM from GitHub as
suggested in one of the comments on the issue above.
2021-10-15 14:41:59 -07:00
Adam Cozzette
519340d662
Update protobuf version (#9106) 2021-10-15 14:33:06 -07:00
Nils
6b0a1c2407
Add prost and quick-protobuf to third_party.md (#9104) 2021-10-15 13:12:01 -07:00
Adam Cozzette
d049bce844
Remove references to HAVE_PTHREAD (#9100)
This is based on @haberman's changes in #8257. Now that we're using
std::mutex we no longer need to check whether pthreads are available, so
this commit removes references to HAVE_PTHREAD. I left the autotools
build alone, though, since we are likely to drop support for it soon
anyway.
2021-10-15 13:10:38 -07:00
Bu Sun Kim
c01cd6ec79
Add python 3.10 (#9034)
* Add python 3.10

* Update setup.py and tox.ini

* fix: fix 3.9 -> 3.10

* fix: py310-cpp
2021-10-15 10:24:49 -07:00
Jorg Brown
72f085747e
Use int32_t rather than int32. 2021-10-14 19:44:18 -07:00
Marnix Bouhuis
6bc21b531e
Update the way we get the global object, to comply with CSP no-unsafe-eval (#8864) 2021-10-14 15:15:20 -07:00
Daniel Kuschny
3e02f65f5c
Skip exports if not available by CommonJS (#8856) 2021-10-14 15:02:21 -07:00
deannagarcia
8b69867fef
Merge pull request #7642 from philjdf/master
[C#] Make FieldDescriptor propertyName public
2021-10-14 12:43:55 -07:00
deannagarcia
5106dea867
Merge pull request #7938 from alusco-scratch/patch-1
Override Map.clone to use Map's dup method
2021-10-14 11:24:01 -07:00
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