Commit Graph

512 Commits

Author SHA1 Message Date
Adam Cozzette
18521f6055 Merge branch '3.19.x' into merge-3.19.x 2022-01-28 17:42:21 +00:00
Adam Cozzette
22d0e265de
Update protobuf version for 3.19.4 (#9449)
I also updated the PHP release notes in
php/ext/google/protobuf/package.xml.
2022-01-27 19:35:56 -08:00
Joshua Haberman
aceff710f4 Fixed data loss bug in Ruby extension. 2022-01-27 17:29:12 -08:00
Maximilian
82372d8fe6
Use proper SPDX license identifier (#9441)
The previously used term "3-Clause BSD License" is not properly
standarized. A common standard is SPDX, therefore "3-Clause BSD License"
is substituted with "BSD-3-Clause" which is a SPDX identifier.

`grep -rl "3-Clause BSD License" | xargs -n1 sed -i "s/3-Clause BSD
License/BSD-3-Clause/g"`
2022-01-27 00:23:14 +00:00
Joshua Haberman
5ef010cb85 Fixed spelling errors in comments. 2022-01-23 16:13:12 -08:00
Joshua Haberman
90065d39a7 Fixed crash bug with proto2 enums. 2022-01-21 20:18:11 -08:00
Joshua Haberman
706ed2d17a Added utf8_range.c as a source file. 2022-01-21 17:32:34 -08:00
Joshua Haberman
c153dd9bf7 Updated to new upb APIs. 2022-01-21 15:46:56 -08:00
Joshua Haberman
f41049a0f0 Updated upb. 2022-01-21 14:41:25 -08:00
Adam Cozzette
5bb34e9930 Merge branch '3.19.x' into merge-3.19.x 2022-01-11 18:07:17 +00:00
Adam Cozzette
cc7b1b5323 Update protobuf version 2022-01-10 18:08:15 -08:00
Adam Cozzette
eb94f17a8b Update protobuf version 2022-01-05 10:05:11 -08:00
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
f681c8d9e6
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 08:26:20 -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
Joshua Haberman
214180c5a2 Dropped Ruby 2.4 support for CI and releases. 2021-12-14 16:33:16 -08:00
Adam Cozzette
7ccf4d8f67
Merge pull request #9169 from protocolbuffers/3.19.x
Merge 3.19.x into master
2021-11-02 10:10:47 -07:00
Adam Cozzette
7c40b2df1f
Update protobuf version (#9167) 2021-10-28 14:07:53 -07: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
deannagarcia
85c4bc4205
Merge pull request #8254 from jufemaiz/feature/ruby-better-from_-support-well_known_types
Improvement: better ruby from_* support in well_known_types.rb
2021-10-27 14:13:27 -07:00
Joel Courtney
bbdcea8547
Remove lib from require 2021-10-28 07:09:11 +11:00
Joel Courtney
4d94a7cd93 Fixed: incorrect tests 2021-10-27 22:20:45 +11:00
Joel Courtney
947a51a464 Test coverage: .from_ruby / #from_ruby 2021-10-26 12:43:57 +11:00
Peter Zhu
3a18299cc0 Fix memory leak in MessageClass.encode
If the line above raises an exception, the upb_arena is lost and memory
is leaked.
2021-10-25 15:55:12 -04:00
Adam Cozzette
17b30e9647
Update protobuf version (#9119) 2021-10-20 10:14:02 -07: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
Joel Courtney
21478b371e
Update well_known_types_test.rb 2021-10-19 12:25:21 +11:00
Joel Courtney
e4ce58cd60
Merge branch 'master' into feature/ruby-better-from_-support-well_known_types 2021-10-17 22:58:15 +11:00
Adam Cozzette
519340d662
Update protobuf version (#9106) 2021-10-15 14:33:06 -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
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
miyucy
3881f49ce9
Add size to Map class (#8068) 2021-10-13 12:54:49 -07: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
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
Elliotte Rusty Harold
174d95c1a7
remove dependency on Jackson 2021-10-06 21:02:51 +00:00
Jason Lunn
7051d82fa9
Bump to 3.18.1 2021-10-06 11:18:11 -04:00
Adam Cozzette
2a75e8ca58 Merge branch '3.18.x' into merge-3.18.x 2021-10-05 14:04:13 -07:00
Adam Cozzette
0dab03ba7b
Update protobuf version to 3.18.1 (#9051)
* Update protobuf version

* Update PHP release notes in package.xml
2021-10-04 17:43:33 -07:00
Jason Lunn
05ddf82f20 Remove blank line 2021-10-04 17:04:03 +00:00
Jason Lunn
793c66ddf0 Include JRuby's pom.xml file when updating version numbers 2021-10-04 17:00:17 +00:00
Jason Lunn
e3ba5ec615 Add trailing backslashes at end of line consistently 2021-10-04 15:45:26 +00:00
Jason Lunn
f5ef2892b4 Add an explicit RUBYLIB path to fix a load error under JRuby 2021-10-04 15:44:38 +00:00
Jason Lunn
b5687819a6 Fix a test regression observed after branch update 2021-10-04 15:43:21 +00:00
Jason Lunn
a09c8e1c79 Fix logic to decouple from the order of fields.keySet 2021-10-04 13:57:47 +00:00
Jason Lunn
3581d85ced Update JRuby to leverage pure-Ruby DSL.
JRuby unit and conformance test fixes.
2021-10-03 18:25:43 -04:00
Adam Cozzette
55b0e11f52 Fix Ruby tests on Mac
It appears that this extra conditional in travis-test.sh is no longer
necessary, and in fact we need to avoid using a custom version of
OpenSSL since that is causing its own error.
2021-09-30 14:34:02 -07:00
Adam Cozzette
0333cb77de Update ruby/travis-test.sh to print commands 2021-09-30 11:55:04 -07:00