Bo Yang
e3f0689d05
Fix bugs for internal integration.
8 years ago
Bo Yang
cc8ca5b6a5
Integrate internal changes
8 years ago
Feng Xiao
337a028bb6
Merge pull request #2236 from hochhaus/master
...
Silence compile warnings in bazel
8 years ago
Andy Hochhaus
b2b65842ea
Silence compile warnings in bazel
8 years ago
Feng Xiao
c0c3aee6b9
Merge pull request #2229 from xfxyjwf/fixbuild
...
Remove missing files from build.
8 years ago
Feng Xiao
431cee60e6
Remove inexist files from build.
8 years ago
Jisi Liu
d947308aa1
update files to include php generators ( #2165 )
8 years ago
Joshua Haberman
60bc203346
Merge pull request #2199 from JasonLunn/patch-1
...
Set platform to "java" under JRuby
8 years ago
Thomas Van Lenten
4d87527807
Merge pull request #2218 from thomasvl/xcode8_updates
...
Update the ObjC projects for Xcode 8
8 years ago
Thomas Van Lenten
297449aaf4
Update the ObjC projects for Xcode 8
...
- Let Xcode 8 update settings on the projects/schemes.
- Migrate Swift tests to Swift 3 syntax.
- Update the build/test script:
- Require Xcode 8 (because of the Swift 3 requirement for tests)
- Update the devices to what Xcode 8 has (8.x simulator seem to fail even
though they can be downloaded in Xcode 8)
- Update the travis images to ones with Xcode 8.
8 years ago
Adam Cozzette
350d49449b
Merge pull request #2206 from acozzette/gitignore
...
Updated .gitignore with Java and JavaScript build artifacts
8 years ago
Adam Cozzette
25dbc8b1ea
Updated .gitignore with Java and JavaScript build artifacts
8 years ago
Jason Lunn
6005648c2c
Add development dependency requirements
...
Uses values from the removed `Gemfile.lock` as a baseline for version requirements, though it has been observed to work with the latest versions of all the referenced gems - see https://travis-ci.org/google/protobuf/builds/163625616 for details
8 years ago
Jason Lunn
ee19a7c346
Remove hanging reference to Gemfile.lock
8 years ago
Jason Lunn
d94ff4142a
Delete Gemfile.lock
...
Avoid [failures in travis](https://travis-ci.org/google/protobuf/jobs/163611664 ) under jruby
8 years ago
Jason Lunn
07f3cab3dd
Set platform to "java" under JRuby
...
Proposed fix for #1594
8 years ago
Thomas Van Lenten
3d598eecee
Merge pull request #2197 from thomasvl/swift_docs
...
Drop the swift docs directory (and content).
8 years ago
Thomas Van Lenten
fb85b4316b
Drop the swift docs directory (and content).
...
Since the official home is looking like it will be in another repo, it makes
more sense for the relevant docs to live there instead.
8 years ago
Jisi Liu
3f59452448
Merge pull request #2192 from google/3.0.x
...
Merge 3.0.x into master.
8 years ago
Joshua Haberman
a289d43608
Added C++ benchmark. ( #1525 )
8 years ago
Feng Xiao
d9ff3ef859
Merge pull request #2153 from haberman/generatechangelog
...
Added convenient script for generating changelog draft.
8 years ago
Jan Tattermusch
1bf97d87f5
Merge pull request #2159 from google/jtattermusch-patch-1
...
Update README.md
8 years ago
Jan Tattermusch
da7c026ce1
Update README.md
8 years ago
Jan Tattermusch
ca21b28287
Merge pull request #2157 from google/csharp_remove_beta_notice
...
Update README.md
8 years ago
Jan Tattermusch
ca8120cfcc
Update README.md
8 years ago
Bo Yang
b28ab73d22
Fix gson dependency.
...
gson 2.3 has internal bug that it doesn't work with some versions of maven.
8 years ago
Feng Xiao
142e2fa45e
Merge pull request #2035 from sergiocampama/cpp
...
Fixes static analyzer issues from xcode.
8 years ago
Josh Haberman
a2e73644be
Added convenient script for generating changelog draft.
8 years ago
Feng Xiao
e25c56a861
Merge pull request #2149 from khingblue/remove-obsoleted-project
...
Remove obsoleted project of j2me
8 years ago
Khing
741aa87942
Remove obsoleted project of j2me
8 years ago
Sergio Campama
1af7c4cb08
Fixes static analyzer issues from xcode.
8 years ago
Joshua Haberman
4f379f81ce
Merge pull request #2144 from abscondment/fix-jruby-hash
...
Fix hash computation for JRuby's RubyMessage
8 years ago
Brendan Ribera
05aa0df532
Fix hash computation for JRuby's RubyMessage
...
`System.identityHashCode` returns a hash that does not consider a
Message's values. This means two Messages with identical values will not
have identical hashCodes.
This patch uses the pattern from RubyMap to combine the hashCodes from
all values in a given message and produce a unique, consistent,
value-based hash.
8 years ago
Thomas Van Lenten
7b00595ddf
Merge pull request #2137 from thomasvl/objc_extensions_tweak
...
Objc extensions tweaks
8 years ago
Thomas Van Lenten
6ab51a0ebd
Use a custom dictionary to avoid NSNumber operations.
...
For the secondary dictionary, use a custom CFDictionary with integer keys to
avoid the NSNumber conversions.
8 years ago
Thomas Van Lenten
5904279ebd
Remove the custom key functions and just use the system provided defaults.
8 years ago
Joshua Haberman
b5bbdb0967
Merge pull request #2037 from abscondment/fix-2036-ruby-hash
...
Fix #2036 (Ruby `hash` broken for Messages with repeated fields.)
8 years ago
Feng Xiao
c44ca26fe8
Merge pull request #2130 from kilink/substring-comment-fix
...
Fix erroneous comment regarding String.substring
8 years ago
Patrick Strawderman
9ac84f8f3f
Fix erroneous comment regarding String.substring
...
Since Java 7, Strings produced with String.substring do not share byte arrays.
8 years ago
Bo Yang
3b001ca6ba
Some php engine implementation doesn't have return_value_ptr properly set. Explicitly use &return_value.
8 years ago
Bo Yang
c6fa9c71a5
Auto-generate proto files for tests.
8 years ago
Bo Yang
f174d36380
Add back missing test proto files.
8 years ago
Jisi Liu
37e0e1ff86
Merge pull request #2111 from pherl/3.0.x
...
Fix the version number for 3.0.2
8 years ago
Jisi Liu
9c4be5f654
Merge pull request #2112 from pherl/merge
...
Merge 3.0.x into master
8 years ago
Thomas Van Lenten
b4235ac79c
Merge pull request #2123 from thomasvl/objc_better_versioning_take2
...
Update the ObjC version checks to support a min and current version.
8 years ago
Thomas Van Lenten
1aa6500056
Update the ObjC version checks to support a min and current version.
...
- Capture the version used to generated.
- Check at compile time and runtime that generated code isn't from a newer
version, also check that the min version required is also supported.
- Keep the old constants/macros/functions to special case the last version
that was working so those generated sources still work until we decide
otherwise.
8 years ago
Paul Yang
e0e54661f7
Check in php implementation. ( #2052 )
...
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
8 years ago
Jisi Liu
683412b23f
Update generated files.
8 years ago
Jisi Liu
58860c021f
Merge remote-tracking branch 'origin/3.0.x' into merge
8 years ago
Jisi Liu
13d6d17262
Fix the version number for 3.0.2
8 years ago