Adam Cozzette
0613ca8284
Merge pull request #9061 from acozzette/merge-3.18.x
...
Merge 3.18.x into master
3 years ago
Elliotte Rusty Harold
1e88936fce
Stop using EasyMock classextension ( #9008 )
...
* get rid of classextension and update EasyMock
3 years ago
Adam Cozzette
2a75e8ca58
Merge branch '3.18.x' into merge-3.18.x
3 years ago
deannagarcia
6f99bfc8c6
Merge pull request #9060 from protocolbuffers/toolchain
...
Changing toolchain names
3 years ago
Jason Lunn
d546ec75ef
Merge pull request #9047 from JasonLunn/jruby_test_fixes_redux
...
Adopt pure ruby DSL implementation for JRuby
3 years ago
Deanna Garcia
a793c7f72a
Fixing builds
3 years ago
Adam Cozzette
0dab03ba7b
Update protobuf version to 3.18.1 ( #9051 )
...
* Update protobuf version
* Update PHP release notes in package.xml
3 years ago
deannagarcia
ec494a07f4
Merge pull request #9052 from protocolbuffers/toolchain
...
Change include messages to match docker
3 years ago
Deanna Garcia
95fdfd771d
Change include messages to match docker
3 years ago
Adam Cozzette
40f6669c46
Update changelog for 3.18.1 ( #9050 )
3 years ago
Jason Lunn
05ddf82f20
Remove blank line
3 years ago
Jason Lunn
793c66ddf0
Include JRuby's pom.xml file when updating version numbers
3 years ago
Jason Lunn
f88c8ef11a
Remove vestigial function that makes a dated claim that Ruby doesn't support proto2
3 years ago
Jason Lunn
e3ba5ec615
Add trailing backslashes at end of line consistently
3 years ago
Jason Lunn
f5ef2892b4
Add an explicit RUBYLIB path to fix a load error under JRuby
3 years ago
Jason Lunn
b5687819a6
Fix a test regression observed after branch update
3 years ago
Jason Lunn
a09c8e1c79
Fix logic to decouple from the order of fields.keySet
3 years ago
Jason Lunn
3581d85ced
Update JRuby to leverage pure-Ruby DSL.
...
JRuby unit and conformance test fixes.
3 years ago
Adam Cozzette
b6993a9060
Merge pull request #9044 from protocolbuffers/3.18.x
...
Merge 3.18.x into master
3 years ago
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.
3 years ago
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
3 years ago
Thomas Van Lenten
be37b08a31
review feedback
3 years ago
Thomas Van Lenten
9ab14a81e1
Fix spacing in message (missing a space between words from line split)
3 years ago
Thomas Van Lenten
5a81e07d44
Add Xcode 13 to the build/test script.
3 years ago
Adam Cozzette
bfc4c3472d
Merge pull request #9021 from acozzette/cherry-pick-fixes
...
Cherry-pick fixes for 3.18.1
3 years ago
Thomas Van Lenten
a9e1d7c177
Remove some of the state handoff via ivars within Parser.
...
Hopefully makes things a litte easier to follow.
3 years ago
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
3 years ago
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.
3 years ago
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.
3 years ago
Adam Cozzette
0333cb77de
Update ruby/travis-test.sh to print commands
3 years ago
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.
3 years ago
deannagarcia
9466151605
Merge pull request #9033 from protocolbuffers/toolchain
...
Specify bits of architectures in toolchain names
3 years ago
Deanna Garcia
f921df8ee0
Specify bits of architectures in toolchain names
3 years ago
Luke Sandberg
b83d5919ce
Merge pull request #8519 from zakhenry/fix/splitFloat32-inaccuracy
...
fix(splitFloat32): Fix incorrect exponent when converting double to float
3 years ago
Joshua Haberman
ef8d418fad
Merge pull request #9030 from haberman/sync-stage
...
Integrate from Piper for C++, Java, and Python
3 years ago
Joshua Haberman
a3d24e34a9
Added new files to Makefile.am.
3 years ago
Joshua Haberman
82deebfa7a
Added new Java Lite files to BUILD/pom.xml.
3 years ago
deannagarcia
c57ee04cf3
Merge pull request #9029 from protocolbuffers/toolchain
...
Change tool paths for docker
3 years ago
Josh Haberman
5a77804106
Added changelog entries from google3.
3 years ago
Deanna Garcia
3a493ffae5
Change tool paths for docker
3 years ago
deannagarcia
bc23dfe314
Merge pull request #9028 from protocolbuffers/toolchain
...
Changing clang path in toolchain
3 years ago
Deanna Garcia
d1a1818898
Changing clang path
3 years ago
Josh Haberman
129b3e8a98
Merge branch 'master' into sync-stage
3 years ago
Joshua Haberman
567efd4c3e
Merge pull request #9026 from haberman/merge-release
...
Merge 3.18.x release branch to master
3 years ago
deannagarcia
72c76f3ffc
Merge pull request #9027 from protocolbuffers/toolchain
...
Changing directory of clang to match docker container
3 years ago
Deanna Garcia
5e62362a09
Changing directory of clang to match docker container
3 years ago
Joshua Haberman
31980b3f6c
Corrected the labels for CHANGES.txt.
3 years ago
Joshua Haberman
2128ce074f
Merge branch '3.18.x' into merge-release
3 years ago
Josh Haberman
28c52fd5c4
Merge tag 'refs/tags/sync-piper' into sync-stage
3 years ago
Josh Haberman
624d29d833
Sync from Piper @399250367
...
PROTOBUF_SYNC_PIPER
3 years ago