AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
8,701 Commits 35 Branches 138 Tags 124 MiB
174d95c1a7
Commit Graph

8701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliotte Rusty Harold
174d95c1a7
remove dependency on Jackson 2021-10-06 21:02:51 +00:00
Jason Lunn
7400f4b342
Merge pull request #9070 from JasonLunn/jruby-version-bump-3.18.1 
Bump JRuby to 3.18.1
 2021-10-06 16:11:21 +00:00
Jason Lunn
7051d82fa9
Bump to 3.18.1 2021-10-06 11:18:11 -04:00
Adam Cozzette
0613ca8284
Merge pull request #9061 from acozzette/merge-3.18.x 
Merge 3.18.x into master
 2021-10-05 17:08:16 -07:00
Elliotte Rusty Harold
1e88936fce
Stop using EasyMock classextension (#9008) 
* get rid of classextension and update EasyMock
 2021-10-05 21:49:01 +00:00
Adam Cozzette
2a75e8ca58 Merge branch '3.18.x' into merge-3.18.x 2021-10-05 14:04:13 -07:00
deannagarcia
6f99bfc8c6
Merge pull request #9060 from protocolbuffers/toolchain 
Changing toolchain names
 2021-10-05 12:19:38 -07:00
Jason Lunn
d546ec75ef
Merge pull request #9047 from JasonLunn/jruby_test_fixes_redux 
Adopt pure ruby DSL implementation for JRuby
 2021-10-05 18:13:27 +00:00
Deanna Garcia
a793c7f72a Fixing builds 2021-10-05 17:49:50 +00: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
deannagarcia
ec494a07f4
Merge pull request #9052 from protocolbuffers/toolchain 
Change include messages to match docker
 2021-10-04 15:23:16 -07:00
Deanna Garcia
95fdfd771d Change include messages to match docker 2021-10-04 21:23:59 +00:00
Adam Cozzette
40f6669c46
Update changelog for 3.18.1 (#9050) 2021-10-04 13:56:35 -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
f88c8ef11a Remove vestigial function that makes a dated claim that Ruby doesn't support proto2 2021-10-04 15:46:14 +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
b6993a9060
Merge pull request #9044 from protocolbuffers/3.18.x 
Merge 3.18.x into master
 2021-10-01 17:37:56 -07:00
Adam Cozzette
aeb624d3b4
Avoid installing anything from Homebrew in test runs (#9043) 
Installing and upgrading Homebrew packages is taking quite a lot of time
(around 20-30 minutes) for each run. This commit removes all Homebrew
usage from the test runs. Homebrew may have been necessary at some point
in the past, but now it appears that everything works without it. The
preinstalled build tools seem to be sufficient for building protoc, and
Ruby is something we already get from rvm.
 2021-10-01 15:45:55 -07:00
Thomas Van Lenten
ffcae81f1f
Merge pull request #9039 from thomasvl/test_parse_simple 
ObjC: Test the simple parse helper and fix an edge case with errors in the final line
 2021-10-01 15:46:03 -04:00
Thomas Van Lenten
be37b08a31 review feedback 2021-10-01 14:31:26 -04:00
Thomas Van Lenten
9ab14a81e1 Fix spacing in message (missing a space between words from line split) 2021-10-01 13:50:50 -04:00
Thomas Van Lenten
5a81e07d44 Add Xcode 13 to the build/test script. 2021-10-01 10:00:09 -04:00
Adam Cozzette
bfc4c3472d
Merge pull request #9021 from acozzette/cherry-pick-fixes 
Cherry-pick fixes for 3.18.1
 2021-09-30 15:50:06 -07:00
Thomas Van Lenten
a9e1d7c177 Remove some of the state handoff via ivars within Parser. 
Hopefully makes things a litte easier to follow.
 2021-09-30 17:56:37 -04:00
Adam Cozzette
5378c9a710 Use the stable version of rvm 
I am hoping this will fix the error we are getting as described here:
https://github.com/rvm/rvm/issues/5014
 2021-09-30 14:39:12 -07: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
Thomas Van Lenten
a7823bbd45 Ensure errors are reported from the last chunk of a file. 
- Fix case where no error was provide if the consumer rejected something in the
  final chunk of input.
- Expose a more testable interface for the parser.
- Test all the basic behaviors of the parser.
 2021-09-30 15:46:52 -04:00
Adam Cozzette
0333cb77de Update ruby/travis-test.sh to print commands 2021-09-30 11:55:04 -07:00
Adam Cozzette
0e7a35f24b Update dist_install test to work around Python issue 
googletest uses a Python script in its build which is not compatible
with Python 3. Unfortunately we can't easily upgrade googletest right
now, so this commit works around the problem by putting a python symlink
pointing to Python 2 in the $PATH.
 2021-09-30 11:53:26 -07:00
deannagarcia
9466151605
Merge pull request #9033 from protocolbuffers/toolchain 
Specify bits of architectures in toolchain names
 2021-09-29 10:43:57 -07:00
Deanna Garcia
f921df8ee0 Specify bits of architectures in toolchain names 2021-09-29 17:36:15 +00:00
Luke Sandberg
b83d5919ce
Merge pull request #8519 from zakhenry/fix/splitFloat32-inaccuracy 
fix(splitFloat32): Fix incorrect exponent when converting double to float
 2021-09-28 21:54:01 -07:00
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
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