Merge pull request #626 from bos/v1.3.0.0

1.3.0.0 release

Author: bergmark

Data/Aeson/Types/FromJSON.hs

@@ -1042,8 +1042,8 @@ instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
 
 instance INCOHERENT_ (Selector s, FromJSON a) =>
   FromRecord arity (S1 s (K1 i (Maybe a))) where
-    parseRecord _ _ (Just lab) obj = (M1 . K1) <$> obj .:? lab
-    parseRecord opts _ Nothing obj = (M1 . K1) <$> obj .:? pack label
+    parseRecord _ _ (Just lab) obj = M1 . K1 <$> obj .:? lab
+    parseRecord opts _ Nothing obj = M1 . K1 <$> obj .:? pack label
         where
           label = fieldLabelModifier opts $
                     selName (undefined :: t s (K1 i (Maybe a)) p)

aeson.cabal

@@ -1,5 +1,5 @@
 name:            aeson
-version:         1.2.3.0
+version:         1.3.0.0
 license:         BSD3
 license-file:    LICENSE
 category:        Text, Web, JSON

changelog.md

@@ -1,5 +1,24 @@
 For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/changelog.md](https://github.com/bos/aeson/blob/master/changelog.md).
 
+### 1.3.0.0
+
+Breaking changes:
+* `GKeyValue` has been renamed to `KeyValuePair`, thanks to Xia Li-yao
+* Removed unused `FromJSON` constraint in `withEmbeddedJson`, thanks to Tristan Seligmann
+
+Other improvements:
+* Optimizations of TH toEncoding, thanks to Xia Li-yao
+* Optimizations of hex decoding when using the default/pure unescape implementation, thanks to Xia Li-yao
+* Improved error message on `Day` parse failures, thanks to Gershom Bazerman
+* Add `encodeFile` as well as `decodeFile*` variants, thanks to Markus Hauck
+* Documentation	fixes, thanks to Lennart Spitzner
+* CPP cleanup, thanks to Ryan Scott
+
+### 1.2.4.0
+
+* Add `Ord` instance for `JSONPathElement`, thanks to Simon Hengel.
+
+
 ### 1.2.3.0
 
 * Added `withEmbeddedJSON` to help parse JSON embedded inside a JSON string, thanks to Jesse Kempf.

stack-nightly.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2017-12-23
+resolver: nightly-2018-03-07
 packages:
 - '.'
 - attoparsec-iso8601
@@ -7,5 +7,3 @@ flags:
     fast: true
   attoparsec-iso8601:
     fast: true
-extra-deps:
-- text-1.2.3.0