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

3175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Van Lenten
efca368939 Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis. 2016-02-16 15:10:14 -05:00
Thomas Van Lenten
ee819ea724 Merge pull request #1245 from thomasvl/tweak_xctool_ios_run 
Tweak the xctool run for iOS tests to try and sort out flake
 2016-02-16 14:27:57 -05:00
Thomas Van Lenten
30e645b6b6 Tweak the xctool run for iOS tests to try and sort out flake 
- Use the plain reporter for slightly more readable logs.
- Add -newSimulatorInstance to the run-tests to see if it helps with flake.
 2016-02-16 11:16:42 -05:00
Thomas Van Lenten
7d1cc109cf Merge pull request #1244 from thomasvl/bump_xcode_version 
Bump up travis to Xcode 7.2
 2016-02-16 11:14:47 -05:00
Thomas Van Lenten
1324119a42 Bump up travis to Xcode 7.2 
- Update simulator versions used.
- Mark the iOS tests as flaky while trying to dig out the root cause.
 2016-02-16 09:19:50 -05:00
Paul Yang
e35e24800f Merge pull request #1226 from jcanizales/patch-1 
Include 'source' attribute in the podspec
 2016-02-12 15:00:38 -08:00
Joshua Haberman
3ee2e20539 Merge pull request #1144 from dongjoon-hyun/remove_redundant_the 
Remove redundant `the`.
 2016-02-11 17:17:48 -08:00
Dongjoon Hyun
86325d7c95 Rewrap the line 2016-02-11 12:47:52 -08:00
Joshua Haberman
caf1fb7197 Merge pull request #997 from anderscarling/better_errors 
ruby: Better exception text for common cases
 2016-02-11 12:41:34 -08:00
Joshua Haberman
e088c2cf4b Merge pull request #1178 from lebauce/fix-readme-typos 
Fix typos in README.md
 2016-02-11 12:35:40 -08:00
Joshua Haberman
635ce854ed Merge pull request #1179 from ParthKolekar/python-examples-with 
Updated python examples to use with.
 2016-02-11 12:32:42 -08:00
Joshua Haberman
d2c7fe6bc5 Merge pull request #1194 from Photonios/master 
Fixed unused parameters and extra ';'
 2016-02-11 11:36:34 -08:00
Joshua Haberman
655a9d667f Merge pull request #1217 from jhump/jh/make-warning-useful 
make 'no syntax' warning useful by showing which file
 2016-02-11 10:43:47 -08:00
Jan Tattermusch
2d3f79f7d6 Merge pull request #1218 from jskeet/nuspec-dependencies 
nuspec dependency fixes
 2016-02-11 10:38:35 -08:00
Jorge Canizales
f492dd8aa4 Include 'source' attribute in the podspec 
The new version of Cocoapods requires it even when using the podspec locally.
 2016-02-10 19:19:17 -08:00
Joshua Haberman
028d59fccd Merge pull request #1225 from google/nmakedoc 
Clarified that 'nmake' must be run before 'nmake check'.
 2016-02-10 14:45:22 -08:00
Josh Haberman
fe96a215d9 Clarified that 'nmake' must be run before 'nmake check'. 2016-02-10 14:44:29 -08:00
Joshua Haberman
a924e0b858 Merge pull request #1185 from kkm000/icl-fix 
Fix Intel compiler warnings in include files on Windows
 2016-02-10 14:12:29 -08:00
Jan Tattermusch
18fba0f138 Merge pull request #1220 from jtattermusch/add_strong_name_key 
Check in strong name key.
 2016-02-10 10:06:26 -08:00
Jan Tattermusch
95c4100230 Add a link 2016-02-10 08:16:45 -08:00
Jan Tattermusch
d40e3a1623 Use checked-in key to build ReleaseSigned 2016-02-09 15:59:05 -08:00
Jan Tattermusch
82f210cbac add private key for strong name assemblies 2016-02-09 15:53:16 -08:00
Joshua Haberman
bc215089ca Merge pull request #1214 from haberman/binarygem 
Added support for binary gems.
 2016-02-08 15:29:11 -08:00
Jon Skeet
f1c5754f0f nuspec dependency fixes 
Explicitly don't add any dependencies for "old" platforms, to avoid unnecessary
dependencies in those cases.

Fixes issue #1203.
 2016-02-08 11:25:07 +00:00
Joshua Humphries
d740bc9bd1 make 'no syntax' warning useful by showing which file 2016-02-06 08:34:08 -05:00
Joshua Haberman
6efe3aaf3d Merge pull request #1 from nicolasnoble/bin-gems 
Few fixes.
 2016-02-05 17:10:04 -08:00
Nicolas "Pixel" Noble
bbb188acdd Actually enabling cross compilation. 2016-02-06 00:55:45 +01:00
Nicolas "Pixel" Noble
4e141bb3b8 Removing usage of git - not everyone grabs the gem using it. 2016-02-06 00:55:28 +01:00
Joshua Haberman
0906f5d18a Merge pull request #1205 from haberman/fixjstests 
Enable JavaScript tests for binary parse/serialize.
 2016-02-05 14:56:14 -08:00
Josh Haberman
70a4b03086 Add rake-compiler-dock as a dep. 2016-02-04 14:18:14 -08:00
Josh Haberman
af4aa9bd64 Added support for binary gems. 2016-02-04 10:44:22 -08:00
Jon Skeet
bd8a476510 Merge pull request #1213 from jskeet/rename-preconditions 
Rename Preconditions to ProtoPreconditions
 2016-02-04 16:11:00 +00:00
Jon Skeet
045b528d4a Generated code changes from previous commit 2016-02-04 15:02:59 +00:00
Jon Skeet
7762f163a4 Rename Preconditions to ProtoPreconditions 
(Generated code changes in next commit.)
 2016-02-04 14:50:43 +00:00
Jan Tattermusch
c78222a366 Merge pull request #1210 from jskeet/rename-generatedcodeinfo 
Rename GeneratedCodeInfo to GeneratedClrTypeInfo
 2016-02-04 06:43:13 -08:00
Jon Skeet
b6159965ec Generated code for GeneratedCodeInfo change 2016-02-04 07:08:55 +00:00
Jon Skeet
a3ea9d1203 Rename GeneratedCodeInfo to GeneratedClrTypeInfo 
Recently, descriptor.proto gained a GeneratedCodeInfo message, which means the generated code conflicts with our type.
Unfortunately this affects codegen as well, although this is a part of the public API which is very unlikely to affect hand-written code.

Generated code changes in next commit.
 2016-02-04 07:05:49 +00:00
Dongjoon Hyun
7a9040fe7f Remove redundant the in comments. 2016-02-03 15:27:27 -08:00
Jie Luo
eb1d156d74 Merge pull request #1207 from jskeet/readme 
Clarify readme for C#
 2016-02-03 11:11:07 -08:00
Jon Skeet
0809de8e9f Clarify readme 2016-02-03 09:45:48 +00:00
Josh Haberman
5394fdb641 Enable JavaScript tests for binary parse/serialize. 
These should have been included in the first match
but I overlooked them.

This involved deleting some of the code that tests
Google-internal-only features.
 2016-02-02 15:54:59 -08:00
Jisi Liu
287a095c87 Merge pull request #1165 from damienmg/master 
Make protobuf Skylark extension appends the workspace root
 2016-02-02 10:38:45 -08:00
Jie Luo
7727e2603c Merge pull request #1195 from calbach/python-json-struct 
Manually down-integrate python JSON struct support from internal code base.
 2016-02-01 10:08:48 -08:00
Jisi Liu
110e31cbbc Merge pull request #1199 from google/google_integrate 
Integrate google internal changes to master
 2016-02-01 10:00:40 -08:00
CH Albach
5477f8cdba Manually down-integrate python JSON struct support from internal code base. 2016-01-29 18:10:50 -08:00
Jisi Liu
defa25b38b Restore the license for Internal.java 2016-01-29 14:04:15 -08:00
Jisi Liu
1b8bab3a78 Uncomment the test, which was commented out during integration 2016-01-29 14:01:01 -08:00
Jisi Liu
5221dcbe47 Integrate from google internal. 
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
 2016-01-29 13:51:05 -08:00
Jisi Liu
cb3f428810 Undo the Java module change for integration. 
Moving the files to their original location, so that opensource changes
can be picked during the internal merge. Those files will be moved into
the correct location after merging with internal code.

Note: do NOT merge this into master without the other internal
down-integration commit.
 2016-01-28 13:59:14 -08:00
Swen Kooij
37d6cf9cfe Fixed unused parameters and extra ';' 2016-01-28 11:40:07 +02:00