AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,973 Commits 35 Branches 138 Tags 124 MiB
d947308aa1
Commit Graph

3973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jisi Liu
d947308aa1 update files to include php generators (#2165) 2016-10-06 11:49:47 -07:00
Joshua Haberman
60bc203346 Merge pull request #2199 from JasonLunn/patch-1 
Set platform to "java" under JRuby
 2016-10-04 11:21:34 -07:00
Thomas Van Lenten
4d87527807 Merge pull request #2218 from thomasvl/xcode8_updates 
Update the ObjC projects for Xcode 8
 2016-10-03 17:11:23 -04:00
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.
 2016-10-03 13:24:24 -04:00
Adam Cozzette
350d49449b Merge pull request #2206 from acozzette/gitignore 
Updated .gitignore with Java and JavaScript build artifacts
 2016-09-30 10:47:20 -07:00
Adam Cozzette
25dbc8b1ea Updated .gitignore with Java and JavaScript build artifacts 2016-09-29 16:20:43 -07:00
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
 2016-09-29 17:31:11 -04:00
Jason Lunn
ee19a7c346 Remove hanging reference to Gemfile.lock 2016-09-29 02:33:17 -04:00
Jason Lunn
d94ff4142a Delete Gemfile.lock 
Avoid [failures in travis](https://travis-ci.org/google/protobuf/jobs/163611664) under jruby
 2016-09-29 02:18:32 -04:00
Jason Lunn
07f3cab3dd Set platform to "java" under JRuby 
Proposed fix for #1594
 2016-09-29 00:18:55 -04:00
Thomas Van Lenten
3d598eecee Merge pull request #2197 from thomasvl/swift_docs 
Drop the swift docs directory (and content).
 2016-09-28 15:34:16 -04:00
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.
 2016-09-28 15:32:51 -04:00
Jisi Liu
3f59452448 Merge pull request #2192 from google/3.0.x 
Merge 3.0.x into master.
 2016-09-27 14:19:30 -07:00
Joshua Haberman
a289d43608 Added C++ benchmark. (#1525) 2016-09-23 11:07:45 -07:00
Feng Xiao
d9ff3ef859 Merge pull request #2153 from haberman/generatechangelog 
Added convenient script for generating changelog draft.
 2016-09-23 10:49:13 -07:00
Jan Tattermusch
1bf97d87f5 Merge pull request #2159 from google/jtattermusch-patch-1 
Update README.md
 2016-09-22 11:22:18 +02:00
Jan Tattermusch
da7c026ce1 Update README.md 2016-09-22 11:07:37 +02:00
Jan Tattermusch
ca21b28287 Merge pull request #2157 from google/csharp_remove_beta_notice 
Update README.md
 2016-09-22 11:04:56 +02:00
Jan Tattermusch
ca8120cfcc Update README.md 2016-09-22 10:08:59 +02:00
Bo Yang
b28ab73d22 Fix gson dependency. 
gson 2.3 has internal bug that it doesn't work with some versions of maven.
 2016-09-21 22:51:36 +00:00
Feng Xiao
142e2fa45e Merge pull request #2035 from sergiocampama/cpp 
Fixes static analyzer issues from xcode.
 2016-09-21 15:19:54 -07:00
Josh Haberman
a2e73644be Added convenient script for generating changelog draft. 2016-09-21 14:41:57 -07:00
Feng Xiao
e25c56a861 Merge pull request #2149 from khingblue/remove-obsoleted-project 
Remove obsoleted project of j2me
 2016-09-21 12:28:15 -07:00
Khing
741aa87942 Remove obsoleted project of j2me 2016-09-21 12:32:14 +10:00
Sergio Campama
1af7c4cb08 Fixes static analyzer issues from xcode. 2016-09-20 17:59:27 -07:00
Joshua Haberman
4f379f81ce Merge pull request #2144 from abscondment/fix-jruby-hash 
Fix hash computation for JRuby's RubyMessage
 2016-09-20 15:25:01 -07:00
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.
 2016-09-20 11:07:42 -07:00
Thomas Van Lenten
7b00595ddf Merge pull request #2137 from thomasvl/objc_extensions_tweak 
Objc extensions tweaks
 2016-09-19 13:50:32 -04:00
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.
 2016-09-19 13:12:54 -04:00
Thomas Van Lenten
5904279ebd Remove the custom key functions and just use the system provided defaults. 2016-09-19 13:12:35 -04:00
Joshua Haberman
b5bbdb0967 Merge pull request #2037 from abscondment/fix-2036-ruby-hash 
Fix #2036 (Ruby `hash` broken for Messages with repeated fields.)
 2016-09-18 21:38:51 -07:00
Feng Xiao
c44ca26fe8 Merge pull request #2130 from kilink/substring-comment-fix 
Fix erroneous comment regarding String.substring
 2016-09-16 17:07:57 -07:00
Patrick Strawderman
9ac84f8f3f Fix erroneous comment regarding String.substring 
Since Java 7, Strings produced with String.substring do not share byte arrays.
 2016-09-16 14:54:58 -07:00
Bo Yang
3b001ca6ba Some php engine implementation doesn't have return_value_ptr properly set. Explicitly use &return_value. 2016-09-15 17:59:49 -07:00
Bo Yang
c6fa9c71a5 Auto-generate proto files for tests. 2016-09-15 17:59:49 -07:00
Bo Yang
f174d36380 Add back missing test proto files. 2016-09-15 17:59:49 -07:00
Jisi Liu
37e0e1ff86 Merge pull request #2111 from pherl/3.0.x 
Fix the version number for 3.0.2
 2016-09-15 15:01:59 -07:00
Jisi Liu
9c4be5f654 Merge pull request #2112 from pherl/merge 
Merge 3.0.x into master
 2016-09-15 14:37:38 -07:00
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.
 2016-09-15 17:36:08 -04:00
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.
 2016-09-15 17:22:51 -04:00
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.
 2016-09-15 11:09:01 -07:00
Jisi Liu
683412b23f Update generated files. 2016-09-14 10:27:22 -07:00
Jisi Liu
58860c021f Merge remote-tracking branch 'origin/3.0.x' into merge 2016-09-14 09:37:48 -07:00
Jisi Liu
13d6d17262 Fix the version number for 3.0.2 2016-09-13 11:36:19 -07:00
Feng Xiao
86fcd879b3 Merge pull request #1765 from mbarbon/master 
Add https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
 2016-09-12 20:45:28 -07:00
Feng Xiao
1affbd8717 Merge pull request #2021 from zlim/bench-fix 
benchmarks: update readme.txt
 2016-09-12 16:08:16 -07:00
Feng Xiao
4f032cd9af Merge pull request #2100 from vladmos/patch-1 
Compatibility with the new version of Bazel.
 2016-09-12 10:02:39 -07:00
Feng Xiao
22e7fa6aef Merge pull request #2092 from dprotaso/master 
Allow the JsonFormat.Parser to ignore unknown fields
 2016-09-12 09:53:27 -07:00
Vladimir Moskva
5caf516976 Resolved a conflict 2016-09-12 11:27:28 +02:00
Feng Xiao
78aee1b15f Merge pull request #2044 from wychen/Win32ANSI 
Fix Win32 error messages on Unicode build
 2016-09-09 16:46:50 -07:00