Commit Graph

1211 Commits

Author SHA1 Message Date
Inderjeet Singh
1fa43821e8 removed unneeded null check. 2016-02-25 19:37:07 -08:00
Inderjeet Singh
79a00cd906 incorporated code review feedback. Simplified the code, merged Device and Control and removed unnecessary fields. 2016-02-25 17:38:48 -08:00
Inderjeet Singh
c731abb293 Fixed a regression in Gson 2.6 where Gson caused NPE if the TypeAdapterFactory.create() returned null. 2016-02-25 13:56:42 -08:00
Jesse Wilson
67bd3a2cf6 Merge pull request #797 from seanbright/osgi-manifest-headers
Restore OSGi manifest headers
2016-02-25 00:08:20 -05:00
Jesse Wilson
29362de134 Merge pull request #798 from ghandhikus/patch-1
Minor readability edit
2016-02-25 00:06:41 -05:00
ghandhikus
0ef3659692 Minor readability edit 2016-02-24 19:50:07 +01:00
Sean Bright
4eff1a855f Restore OSGi manifest headers
Commit 2016e95 removed the necessary MANIFEST.MF headers for Gson to
resolve in an OSGi environment. This patch restores them.
2016-02-24 09:14:09 -05:00
Jesse Wilson
8f8d903913 Merge pull request #794 from jpaugh/patch-1
Collapse bullets into a paragraph
2016-02-22 20:32:16 -05:00
Jonathan Paugh
bad5cc8047 Collapse bullets into a paragraph
The section entitled "Collections Limitations" contains 3 bullets, but one semantic point.

Make this point in a paragraph instead of a bullet list.
2016-02-22 15:30:29 -06:00
Jake Wharton
a52828cde7 Merge pull request #793 from egor-n/patch-1
Fix RuntimeTypeAdapterFactory javadoc
2016-02-19 09:55:24 -05:00
Egor N
edaf59e178 Fix RuntimeTypeAdapterFactory javadoc 2016-02-19 16:14:55 +02:00
Jake Wharton
02838e1e30 Merge pull request #792 from dongjoon-hyun/fix_typos
Fix some typos in gson comments.
2016-02-15 17:15:46 -05:00
Dongjoon Hyun
aa209fa255 Fix some typos in gson comments. 2016-02-15 14:11:23 -08:00
inder123
6f15cd0060 Merge pull request #791 from haskellcamargo/master
Fixed code style to remove explicit casting op.
2016-02-14 15:56:35 -08:00
Marcelo Camargo
bddc1a9ed3 Fixed code style to remove explicit casting op.
· Separated binary operators
2016-02-14 03:47:05 -02:00
jwilson
0ae177fefb Update docs for Gson 2.6.1. 2016-02-11 23:17:00 -05:00
jwilson
796b4ca26d [maven-release-plugin] prepare for next development iteration 2016-02-11 22:53:04 -05:00
jwilson
3c9b9af0a1 [maven-release-plugin] prepare release gson-parent-2.6.1 2016-02-11 22:52:59 -05:00
Jesse Wilson
233f6dd596 Merge pull request #790 from google/jwilson_0211_java_16
Build Gson for Java 1.6.
2016-02-11 22:52:16 -05:00
jwilson
11d89f39c9 Build Gson for Java 1.6.
The upgrade to Java 1.7 was a clumsy bug.
2016-02-11 22:42:41 -05:00
jwilson
85722329db [maven-release-plugin] prepare for next development iteration 2016-02-11 13:03:12 -05:00
jwilson
b8220eb195 [maven-release-plugin] prepare release gson-parent-2.6 2016-02-11 13:03:10 -05:00
Jesse Wilson
09c3a95b14 Merge pull request #787 from google/jwilson_0211_simplify_gson_poms
Simplify Gson poms.
2016-02-11 12:58:53 -05:00
jwilson
2016e9553e Simplify Gson poms.
A lot of the configuration in these poms has been taken over by improvements
to the Maven release plugin.
2016-02-11 12:56:33 -05:00
jwilson
7c65a225f5 Update changelog for Gson 2.6. 2016-02-11 12:15:15 -05:00
inder123
8383f5c7fa Merge pull request #769 from paniko0/master
timezones without minutes should be valid according RFC3339
2016-02-02 20:23:52 -08:00
Jesse Wilson
af68d70cd5 Merge pull request #773 from google/jw/rfc7159
Update reader and writer for RFC 7159.
2016-01-18 15:16:01 -05:00
Jake Wharton
c8627c8ab8 Update reader and writer for RFC 7159. 2016-01-18 15:07:33 -05:00
inder123
2ab776b5f5 Merge pull request #771 from google/jw/global-leniency
Add setting for leniency on Gson instance.
2016-01-18 14:03:23 -05:00
Jake Wharton
3360c93a76 Add setting for leniency on Gson instance.
Add a JsonReader factory (for parity with the JsonWriter one) which provides a configured instance using the Gson settings.
2016-01-18 12:08:11 -05:00
Jesse Wilson
57b08bbc31 Merge pull request #772 from chalup/nullsafe-jsonadapter
Add nullsafe option to JsonAdapter annotation
2016-01-18 11:56:14 -05:00
Jerzy Chalupski
23e2916947 Make TypeAdapters created by @JsonAdapter null-safe 2016-01-18 16:41:07 +01:00
Jesse Wilson
34f4005829 Merge pull request #770 from Psidium/master
Fix typo in JsonArray docs
2016-01-12 07:16:19 -08:00
Psidium
61f58baaf9 fix typo in JsonArray docs 2016-01-12 11:02:42 -02:00
Danillo Souza
ed6298c98a timezones without minutes should are valid according RFC3339 2016-01-11 15:33:55 -02:00
inder123
1f803bd37d Merge pull request #761 from google/jw/nuke-synthetics
Remove synthetic accessors from being generated.
2015-12-27 14:08:23 -05:00
Jake Wharton
7a1c94f986 Remove synthetic accessors from being generated. 2015-12-27 01:39:19 -05:00
inder123
59a8fb5c5e Update pom.xml 2015-12-14 16:48:49 -08:00
inder123
ddfb2c5c8e Update README.md 2015-12-02 17:21:24 -08:00
inder123
be29e052ec added build status 2015-12-02 12:41:17 -08:00
inder123
016aac18af Merge pull request #751 from mbrukman/docs-release-process-list-numbering
Remove explicit step numbers; use autonumbering.
2015-11-28 10:39:01 -08:00
Misha Brukman
994d589bcf Remove explicit step numbers; use autonumbering.
Markdown supports automatic list numbering; using this approach makes it easier
to add or remove new items without having to update all the following entries.
2015-11-27 20:09:46 -05:00
Jesse Wilson
01cad42b82 Merge pull request #748 from mbrukman/docs-release-process
Release process: cleanups and formatting fixes
2015-11-27 19:31:32 -05:00
Jesse Wilson
b1cb92c4a5 Merge pull request #749 from mbrukman/docs-user-guide
Added language annotations to code blocks.
2015-11-27 19:31:10 -05:00
Misha Brukman
883fbd0a16 Added language annotations to code blocks.
This enables GitHub to do proper syntax highlighting, thus improving the
readability of multi-line code blocks. As a result, some changes were required
to make the code blocks syntactically correct, since they're actually parsed by
language-aware parsers; primarily, this meant inserting comments.
2015-11-27 18:40:04 -05:00
Misha Brukman
137100e2e2 Cleanups and formatting fixes
* Formatted multi-line and complex commands via multi-line blocks and
  line-wrapping for readability and ease of copy-pasting
* Hid URLs behind text links for readability and brevity
* Added missing code formatting, both inline and blocks
2015-11-27 18:25:14 -05:00
inder123
dcbcf067fc Merge pull request #747 from mbrukman/docs-formatting
Docs fixes: markdown, links, formatting.
2015-11-27 14:27:00 -08:00
Misha Brukman
b4ca41aafe Docs fixes: markdown, links, formatting.
* Removed extra spacing after bullets in list
* Removed extra blank lines; fixed indentation
* Fixed all links (including examples) to code.google.com to use github.com
  instead; deep links to code.google.com redirect to top-level GitHub project
  page, thus rendering them useless
* Removed extra strings in Markdown link targets
* Fixed capitalization and grammar
* Added more code formatting
2015-11-27 17:13:19 -05:00
Jake Wharton
5fdba9f647 Merge pull request #746 from mbrukman/full-license-txt
Add full license text for Apache License 2.0
2015-11-27 16:48:32 -05:00
Misha Brukman
95c5a7d570 Add full license text for Apache License 2.0
Moved the short-form license to README.
2015-11-27 16:42:01 -05:00