wbrawner/moshi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
621 commits 18 branches 12 tags 2.2 MiB
Commit graph

621 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jesse Wilson
01a406eac9
Merge pull request #708 from square/jwilson.1013.flattening 
JSON flattening.
 2018-10-19 11:23:03 -04:00
Jesse Wilson
f28bca609a JSON flattening. 
This is a new API that makes it possible to do more interesting things
with composition. It's currently write-only; doing composition on reads
is much more difficult.
 2018-10-19 10:59:19 -04:00
Jesse Wilson
08bfedaeb2
Merge pull request #707 from square/jwilson.1009.streaming_RuntimeJsonAdapterFactory 
Change RuntimeJsonAdapterFactory to peek for type names.
 2018-10-13 20:43:53 -04:00
Jesse Wilson
24ac43a799 Change RuntimeJsonAdapterFactory to peek for type names. 
This is a bit awkward because JsonReader.Options doesn't tell you
what its values are.

Also awkward because we don't yet have an equivalent to stream
the encode of the value.
 2018-10-09 23:10:31 -04:00
Jesse Wilson
cfaf62c95f
Merge pull request #706 from square/eric.javadoc 
Fix Javadoc code formatting for JsonReader.peek().
 2018-10-08 15:54:57 -04:00
Eric Cochran
931673c264
Fix Javadoc code formatting for JsonReader.peek(). 2018-10-08 12:48:44 -07:00
Jesse Wilson
2a4d37ece4
Merge pull request #704 from square/jwilson.1007.peekutf8 
Implement peekJson() for JsonUtf8Reader
 2018-10-08 12:27:02 -04:00
Jesse Wilson
01c45ca2a8
Merge pull request #705 from square/jwilson.1008.register_as_factory 
Document how to register JsonAdapters
 2018-10-08 12:24:17 -04:00
Jesse Wilson
7055391230 Implement peekJson() for JsonUtf8Reader 
This required an upgrade to Okio 1.16.0.
 2018-10-08 11:44:03 -04:00
Jesse Wilson
fe22970973 Document how to register JsonAdapters 
Closes: https://github.com/square/moshi/issues/698
 2018-10-08 11:14:57 -04:00
Jesse Wilson
eb64d186a6
Merge pull request #680 from square/jwilson.0923.peekvalue 
Implement peekJson() for JsonValueReader
 2018-10-07 16:59:20 -04:00
Jesse Wilson
10e2b77585
Merge pull request #703 from square/z/allow-other-processors 
Allow other processors to process JsonClass
 2018-10-06 12:40:15 -04:00
Zac Sweers
a34ca365f0
Allow other processors to process JsonClass 
Someone at KotlinConf brought this to my attention, as they're trying to generate their own adapter factory but can't since moshi consumes the annotation and doesn't allow others.
 2018-10-06 17:05:06 +02:00
Zac Sweers
bd2f2c4c28 Mention proguard 6 requirement (#686) 
* Mention proguard 6 requirement

* Mention AGP instead
 2018-09-29 22:59:52 -04:00
Zac Sweers
e0861cca57
Improve enum exception message (#694) 
* Improve enum exception message

It is applicable to enums for proguard reasons, just not with code gen as well

* Update test message
 2018-09-28 00:24:58 -04:00
Zac Sweers
21a9c56975
Merge pull request #693 from technoir42/keep-enum-fields 
Always keep fields of annotated enums
 2018-09-27 23:42:22 -04:00
Zac Sweers
2990583a1f
Merge pull request #695 from square/jwilson.0927.dollar 
Don't use @Language when the literal includes a dollar sign
 2018-09-27 23:41:43 -04:00
Jesse Wilson
a5d35730de Don't use @Language when the literal includes a dollar sign 
It makes IntelliJ grumpy.
https://youtrack.jetbrains.com/issue/KT-27224
 2018-09-27 09:45:44 -04:00
sergey
b5db9fa7f1 Always keep fields of annotated enums 2018-09-27 00:54:39 +03:00
Gabriel Ittner
b7055944a9 Proguard config: keep field names of annotated enums (#691) 
closes #689
 2018-09-25 11:52:05 -07:00
Jesse Wilson
705ddc24e3
Merge pull request #687 from hzsweers/z/removeExtensions 
Completely remove companion object jsonAdapter extension function gen
 2018-09-25 07:08:54 -04:00
Jesse Wilson
11cbd5eae2
Merge pull request #688 from square/eric.version 
Remove duplicate kotlin-metadata version declaration.
 2018-09-25 07:06:16 -04:00
Eric Cochran
526717ec36
Remove duplicate kotlin-metadata version declaration. 
The version is already defined in the root.
 2018-09-25 00:17:32 -07:00
Zac Sweers
86c8671d64 Completely remove companion object jsonAdapter extension function gen 
It's broken currently (see #611), and after talking with @swankjesse decided it's best to just nix this API
 2018-09-25 00:58:52 -04:00
Jesse Wilson
00dcac60d4 Implement peekJson() for JsonValueReader 
The JsonUtf8Reader variant relies on an update to Okio that we're
not quite ready for.

This one became straightforward after I changed out the iterators
to be cloneable. That's necessary to split one iterator into two.
It's too bad the platform's built-in iterators are not cloneable;
that would have been convenient and potentially more efficient.

Related to https://github.com/square/moshi/issues/672
 2018-09-24 23:21:07 -04:00
Jesse Wilson
2cb81857ac [maven-release-plugin] prepare for next development iteration 2018-09-24 22:55:49 -04:00
Jesse Wilson
9a652f8788 [maven-release-plugin] prepare release moshi-parent-1.7.0 2018-09-24 22:55:35 -04:00
Jesse Wilson
662386cc03
Merge pull request #685 from square/jwilson.0924.internal_dopcs 
Don't include the 'internal' package in Javadocs
 2018-09-24 22:50:43 -04:00
Jesse Wilson
026d16ba68 Don't include the 'internal' package in Javadocs 2018-09-24 22:35:29 -04:00
Jesse Wilson
efd324b82f Update changelog for 1.7.0. 2018-09-24 22:26:55 -04:00
Jesse Wilson
73ca7765c0
Merge pull request #684 from square/jwilson.0924.upgrayedd 
Upgrade Kotlin, AssertJ, compile-testing, and kotlin-metadata depende…
 2018-09-24 22:13:43 -04:00
Jesse Wilson
6e6e533869
Merge pull request #683 from square/jwilson.0924.change_visibility 
Hide RuntimeJsonAdapterFactory for the forthcoming release.
 2018-09-24 21:49:25 -04:00
Jesse Wilson
735f0c39f7 Upgrade Kotlin, AssertJ, compile-testing, and kotlin-metadata dependencies 2018-09-24 21:48:25 -04:00
Jesse Wilson
11241a2b02 Hide RuntimeJsonAdapterFactory for the forthcoming release. 
We don't yet have the behavior we want for looking ahead at the type label.
 2018-09-24 21:03:20 -04:00
Jesse Wilson
f873bd93b7
Merge pull request #682 from sullis/maven-compiler-plugin-3.8.0 
maven-compiler-plugin 3.8.0
 2018-09-24 10:31:31 -04:00
Sean Sullivan
4392642f03 maven-compiler-plugin 3.8.0 2018-09-23 21:12:54 -07:00
Jesse Wilson
f466909967
Merge pull request #674 from square/eric.2018-09-18.codegen-adapter-lookup-error-hint 
Use the adapter lookup hint API in Kotlin codegen adapters.
 2018-09-23 21:16:52 -04:00
Eric Cochran
5a46cd6bd5
Use BufferedSource.indexOf instead of loops. (#677) 
Cleanup of a rare code path for block comments in lenient readers.
 2018-09-20 21:20:11 -07:00
Eric Cochran
242b7b1055 Use the adapter lookup hint API in Kotlin codegen adapters. 2018-09-20 21:00:18 -07:00
Jesse Wilson
1ba25ef3f9
Merge pull request #660 from square/eric.fix-preemptive-null-check 
Allow user adapters to convert null to non-null in codegen.
 2018-09-20 23:36:40 -04:00
Jesse Wilson
a813cd1352
Merge pull request #665 from square/eric.runtime-adapter-object-base 
Fix RuntimeJsonAdapterFactory breaking with Object as the base type.
 2018-09-20 23:34:30 -04:00
Jesse Wilson
226c0c14f2
Merge pull request #673 from square/eric.property-name-hint 
Use the adapter lookup hint API in the Kotlin reflection adapter.
 2018-09-20 23:32:21 -04:00
Eric Cochran
05cfb77430
Use the adapter lookup hint API in the Kotlin reflection adapter. 2018-09-18 18:00:22 -07:00
Eric Cochran
810199a442 Disallow Object for RuntimeJsonAdapterFactory's base type. 2018-09-18 17:57:11 -07:00
Benoît Quenaudon
e0cdcd4ff8
Merge pull request #668 from square/bquenaudon/2018-09-13/fix-jsonadapter-test 
Fix JsonQualifiers test
 2018-09-14 09:00:13 -04:00
Benoit Quenaudon
df730cafb9
Fix JsonQualifiers test 2018-09-13 15:02:06 -04:00
Eric Cochran
895c3ddb49 Track field names in the adapter lookup stack. (#616) 
* Track field names in the adapter lookup stack.

This allows for an error message that includes field names to track down the cause of adapter creation failure for deeply nested structures.

* Use a single stack in Moshi client.

* Make optional fieldName parameter public API.

* Simplify error message.
 2018-09-12 22:27:58 -04:00
Jesse Wilson
83b6b26e63
Merge pull request #659 from square/eric.exception-cause 
Add exception cause for method adapter creation.
 2018-09-12 22:24:22 -04:00
Jesse Wilson
62c14b872d
Merge pull request #658 from square/eric.okio15 
Update to Okio 1.15.0.
 2018-09-12 22:23:56 -04:00
Zac Sweers
d6ad1b8bad
Merge pull request #667 from oldergod/bquenaudon/2018-09-12/androidx 
Don't reflect on androidX
 2018-09-12 15:08:01 -07:00