Merge branch 'develop'

killy971 · Apr 17, 2017 · 265e2b2 · 265e2b2 · killy971 · Apr 17, 2017
2 parents c889606 + ac5e83f
commit 265e2b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+[1.0.8](https://github.com/guillaume-nargeot/hpc-coveralls/issues?q=milestone:v1.0.9+is:closed)
+-----
+* Allow aeson 1.2 (issue #67)
+
 [1.0.8](https://github.com/guillaume-nargeot/hpc-coveralls/issues?q=milestone:v1.0.8+is:closed)
 -----
 * Allow directory 1.3 (issue #66)

diff --git a/hpc-coveralls.cabal b/hpc-coveralls.cabal
@@ -1,5 +1,5 @@
 name:           hpc-coveralls
-version:        1.0.7
+version:        1.0.9
 synopsis:       Coveralls.io support for Haskell.
 description:
   This utility converts and sends Haskell projects hpc code coverage to
@@ -28,7 +28,7 @@ category:       Control
 build-type:     Simple
 stability:      experimental
 cabal-version:  >= 1.8
-tested-with:    GHC == 7.6, GHC == 7.8, GHC == 7.10
+tested-with:    GHC == 7.6, GHC == 7.8, GHC == 7.10, GHC == 8.0
 homepage:       https://github.com/guillaume-nargeot/hpc-coveralls
 bug-reports:    https://github.com/guillaume-nargeot/hpc-coveralls/issues
 
@@ -56,7 +56,7 @@ library
     Trace.Hpc.Coveralls.GitInfo,
     Trace.Hpc.Coveralls.Paths
   build-depends:
-    aeson          >= 0.7.1   && <1.2,
+    aeson          >= 0.7.1   && <1.3,
     base           >= 4       && < 5,
     bytestring     >= 0.10    && <0.11,
     Cabal,
@@ -77,7 +77,7 @@ executable hpc-coveralls
   hs-source-dirs: src
   main-is:        HpcCoverallsMain.hs
   build-depends:
-    aeson          >= 0.7.1   && <1.2,
+    aeson          >= 0.7.1   && <1.3,
     base           >= 4       && < 5,
     bytestring     >= 0.10    && <0.11,
     Cabal,