summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdamBergmark <>2017-04-23 11:02:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-04-23 11:02:00 (GMT)
commitdb826b72a6e69d68337d7fb9b8cf2848316624b3 (patch)
treeb759b2542bb74af1440f10a86b685cf93f96e0aa
parentecd6e875bbec6b9a75ec4bccb7cf4b8df3f2fdeb (diff)
version 0.2.0.9HEAD0.2.0.9master
-rw-r--r--CHANGELOG.md5
-rw-r--r--generic-aeson.cabal8
-rw-r--r--src/Generics/Generic/Aeson.hs2
3 files changed, 10 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 278456d..6655c3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
# Changelog
+#### 0.2.0.9
+
+* Allow `aeson 1.2.*`
+* Fix a documentation typo
+
#### 0.2.0.8
* Fix compilation on GHC 8.
diff --git a/generic-aeson.cabal b/generic-aeson.cabal
index d047d99..2e62550 100644
--- a/generic-aeson.cabal
+++ b/generic-aeson.cabal
@@ -1,5 +1,5 @@
name: generic-aeson
-version: 0.2.0.8
+version: 0.2.0.9
synopsis: Derivation of Aeson instances using GHC generics.
description: Derivation of Aeson instances using GHC generics.
author: Silk
@@ -28,13 +28,13 @@ library
Generics.Generic.IsEnum
build-depends:
base >= 4.4 && < 4.10
- , aeson >= 0.6 && < 0.12
+ , aeson >= 0.6 && < 1.3
, attoparsec >= 0.11 && < 0.14
- , generic-deriving >= 1.6 && < 1.11
+ , generic-deriving >= 1.6 && < 1.12
, mtl >= 2.0 && < 2.3
, tagged >= 0.2 && < 0.9
, text >= 0.11 && < 1.3
, unordered-containers == 0.2.*
- , vector >= 0.10 && < 0.12
+ , vector >= 0.10 && < 0.13
if impl(ghc < 7.6)
build-depends: ghc-prim
diff --git a/src/Generics/Generic/Aeson.hs b/src/Generics/Generic/Aeson.hs
index a4a1c74..2856968 100644
--- a/src/Generics/Generic/Aeson.hs
+++ b/src/Generics/Generic/Aeson.hs
@@ -10,7 +10,7 @@
#if __GLASGOW_HASKELL__ < 710
{-# LANGUAGE OverlappingInstances #-}
#endif
--- | This module offers generic conversions to an from JSON 'Value's
+-- | This module offers generic conversions to and from JSON 'Value's
-- for data types with a 'Generic' instance.
--
-- The structure of the generated JSON is meant to be close to