Commit graph

705 commits

Author SHA1 Message Date
Eric Cochran
d31f3c2482 Add more CheckReturnValues for JsonReader.
This encourages skipName over nextName.
2018-05-15 18:37:29 -07:00
Pierre Degand
b5a50d8281 Update Proguard configuration for codegen (#542)
* Update Proguard configuration for codegen

-keepnames will prevent Proguard from renaming the class during obfuscation phase but won't protect the class from code shrinking.
In most cases, the generated are never referenced directly in the code as the adapters are loaded dynamically.
This means that, for Proguard, the class is unused and it will remove the generated adapters during the shrinking phase.

The adapters need to be kept as well as there primary constructor.

* Keep fields of generated JsonAdapter
2018-05-15 21:34:56 -04:00
Jesse Wilson
16938ab83a
Merge pull request #541 from LouisCAD/patch-1
Add missing val and fix indentation in README
2018-05-15 06:15:33 -04:00
Jesse Wilson
279b1e00a7
Merge pull request #539 from 3flex/patch-1
README: fix typo
2018-05-15 06:14:42 -04:00
Jesse Wilson
40817a2f2a
Merge pull request #538 from hzsweers/patch-2
Fix adapter factory name in proguard mention
2018-05-15 06:13:59 -04:00
Louis CAD
6187be0c59
Add missing val and fix indentation in README 2018-05-15 09:23:13 +02:00
Matthew Haughton
373209640d
README: fix typo 2018-05-15 16:52:11 +10:00
Zac Sweers
0c39719d12
Fix adapter factory name in proguard mention
Derp
2018-05-14 20:54:30 -07:00
Jesse Wilson
a8616ff10d
Merge pull request #537 from hzsweers/patch-1
Update proguard rules to differentiate between reflect or codegen
2018-05-14 23:35:30 -04:00
Zac Sweers
defebcf8e5
Update proguard rules to differentiate between reflect or codegen 2018-05-14 20:22:23 -07:00
Jesse Wilson
6e411eb243 Update ProGuard rules for Kotlin codegen 2018-05-14 23:17:20 -04:00
Jesse Wilson
31ef245eeb [maven-release-plugin] prepare for next development iteration 2018-05-14 23:00:15 -04:00
Jesse Wilson
bf4d1f8693 [maven-release-plugin] prepare release moshi-parent-1.6.0 2018-05-14 23:00:02 -04:00
Jesse Wilson
6deb12bdc8 Update README for 1.6.0. 2018-05-14 22:57:59 -04:00
Jesse Wilson
0b26628232
Merge pull request #536 from square/jwilson.0514.cast_shade
Shade unreleased KotlinPoet 0.7.0.
2018-05-14 22:52:35 -04:00
Jesse Wilson
9c55f5df59
Merge pull request #535 from square/jwilson.0514.skipName
Generated adapters should use skipName(), not nextName().
2018-05-14 22:52:28 -04:00
Jesse Wilson
b857388796 Shade unreleased KotlinPoet 0.7.0.
That way we won't collide with other annotation processors if they have an
incompatible version.
2018-05-14 22:40:29 -04:00
Jesse Wilson
dd3043722e Generated adapters should use skipName(), not nextName(). 2018-05-14 22:39:33 -04:00
Jesse Wilson
50a5ef3e7d Update changelog for 1.6 2018-05-14 21:54:34 -04:00
Jesse Wilson
c935fe36a8 Update readme for Kotlin codegen 2018-05-14 21:46:55 -04:00
Jesse Wilson
62e6363914
Merge pull request #534 from square/jwilson.0514.yield
Change the Kotlin reflection adapter to yield to the codegen adapter
2018-05-14 21:46:26 -04:00
Jesse Wilson
dd84b9f8f8 Change the Kotlin reflection adapter to yield to the codegen adapter 2018-05-14 21:07:46 -04:00
Jesse Wilson
3f1e4b5a3d
Merge pull request #533 from square/jwilson.0514.kotlin_reflect
Move Kotlin reflection into a kotlin/reflect directory
2018-05-14 18:03:10 -04:00
Jesse Wilson
60cb608956 Move Kotlin reflection into a kotlin/reflect directory
The maven coordinates stay the same.
2018-05-14 17:28:28 -04:00
Jesse Wilson
a0df085b81
Merge pull request #532 from square/jwilson.0514.move_kompiler
Move the Kotlin code generator to the kotlin/ module
2018-05-14 16:36:34 -04:00
Jesse Wilson
9f69029ef0 Move the Kotlin code generator to the kotlin/ module 2018-05-14 16:29:52 -04:00
Jesse Wilson
c5c4cac6c3
Merge pull request #531 from square/jwilson.0513.track_test_cases
Finish migrating tests from the reflective adapter
2018-05-14 12:10:33 -04:00
Jesse Wilson
13952c5430 Finish migrating tests from the reflective adapter 2018-05-13 21:52:06 -04:00
Zac Sweers
298aff24f5 Fix nullability not being preserved and clean up from shadowed names (#529)
* Add helper TypeName.asNullableIf extension

* Add missing nullability preservers to TypeResolver

* Fix shadowed names and add more missing nullable stuff
2018-05-13 14:38:02 -04:00
Jesse Wilson
986cc4c794 [maven-release-plugin] prepare for next development iteration 2018-05-06 21:50:45 -04:00
Jesse Wilson
c2f890879c [maven-release-plugin] prepare release moshi-parent-1.6.0-RC1 2018-05-06 21:50:39 -04:00
Jesse Wilson
1407ca4392 Update changelog for forthcoming release 2018-05-06 21:48:28 -04:00
Jesse Wilson
7b1177adbc
Merge pull request #503 from square/eric.write-from-source
Allow writing out raw JSON.
2018-05-06 21:11:34 -04:00
Jesse Wilson
c39fc12729
Merge pull request #523 from hzsweers/z/nonNullTypeVariabels
Fix nullable properties of TypeVariable types
2018-05-06 21:10:38 -04:00
Zac Sweers
4b610329bd Full JsonQualifier support in kotlin codegen. 2018-05-06 21:09:28 -04:00
Zac Sweers
54aca07ca1 Fix nullable properties of TypeVariable types
We were forgetting to apply the property's nullability to the resolved type.

Fixes #521
2018-05-04 13:29:50 -07:00
Jesse Wilson
10a5dc827b
Merge pull request #524 from square/jwilson.0504.green_green
Fix some tests that have the wrong expected exception message
2018-05-04 15:49:16 -04:00
Jesse Wilson
c35e3a1550 Fix some tests that have the wrong expected exception message
The message got improved in a conflicting change to these tests being added.
2018-05-04 15:39:55 -04:00
Jesse Wilson
eb24a23568
Merge pull request #511 from square/eric.non-null
Fix error message for assigning to non-null properties.
2018-05-04 15:06:35 -04:00
Jesse Wilson
98c4358615
Merge pull request #519 from square/eric.kotlin-path
Fix path for non-null value message.
2018-05-04 14:31:39 -04:00
Jesse Wilson
bb2705128c
Merge pull request #520 from square/eric.skipName
Add JsonReader.skipName.
2018-05-04 14:14:00 -04:00
Eric Cochran
b848f1cc52 Add JsonReader.skipName. 2018-04-30 18:41:18 -07:00
Eric Cochran
dfaf3405b2 Fix path for non-null value message. 2018-04-30 18:18:34 -07:00
Eric Cochran
a0cd8a4fc0 Allow writing out raw JSON. 2018-04-29 23:49:47 -07:00
Jesse Wilson
7018cec47d
Merge pull request #516 from hzsweers/z/metadata14
Update to kotlin-metadata 1.4 and use shaded compiler
2018-04-29 20:45:20 -04:00
Zac Sweers
d195203865 Update to kotlin-metadata 1.4 and use shaded compiler
Per https://github.com/Takhion/kotlin-metadata/releases/tag/v1.4.0

Now the compiler is shaded and not prone to breaking on kotlin updates, making it more robust until Jetbrains releases an official API for reading metadata.
2018-04-28 20:30:30 -07:00
Jesse Wilson
b96397f6eb
Merge pull request #500 from square/eric.coherent-nesting-problem-error-message
Add coherent error message for uneconded map keys.
2018-04-28 21:14:45 -04:00
Jake Wharton
4f3f74f016
Merge pull request #515 from square/eric.versions
Group dependency version codes together.
2018-04-27 10:27:41 -04:00
Jake Wharton
16fd551176
Merge pull request #513 from square/eric.ep
Update Error Prone to 2.3.1.
2018-04-27 10:27:14 -04:00
Jake Wharton
fa4aa364e1
Merge pull request #512 from square/eric.moshi-docs
Fix up out-of-date comments.
2018-04-27 10:27:03 -04:00