Merge pull request #71 from phadej/ghc-8.4.1

Ghc 8.4.1

.travis.yml

@@ -45,12 +45,9 @@ matrix:
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
     - compiler: "ghc-8.4.1"
-      env: GHCHEAD=true
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
 
-  allow_failures:
-    - compiler: "ghc-8.4.1"
-
 before_install:
   - HC=${CC}
   - HCPKG=${HC/ghc/ghc-pkg}
@@ -73,21 +70,6 @@ install:
   - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
   - rm -fv cabal.project cabal.project.local
   - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
-  # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
-  - |
-    if $GHCHEAD; then
-      sed -i.bak 's/-- allow-newer:.*/allow-newer: *:base, *:template-haskell, *:ghc, *:Cabal/' ${HOME}/.cabal/config
-
-      echo 'repository head.hackage'                                                        >> ${HOME}/.cabal/config
-      echo '   url: http://head.hackage.haskell.org/'                                       >> ${HOME}/.cabal/config
-      echo '   secure: True'                                                                >> ${HOME}/.cabal/config
-      echo '   root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
-      echo '              2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
-      echo '              8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
-      echo '   key-threshold: 3'                                                            >> ${HOME}/.cabal.config
-
-      cabal new-update head.hackage -v
-    fi
   - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
   - "printf 'packages: \".\"\\n' > cabal.project"
   - cat cabal.project
@@ -97,7 +79,7 @@ install:
   - rm -f cabal.project.freeze
   - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
   - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
-  - rm -rf "."/.ghc.environment.* "."/dist
+  - rm -rf .ghc.environment.* "."/dist
   - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
 
 # Here starts the actual work to be performed for the package under test;

CHANGELOG.md

@@ -1,3 +1,8 @@
+0.3.8.1
+---
+
+* GHC-8.4.1 support
+
 0.3.8
 ---
 

http-api-data.cabal

@@ -1,5 +1,5 @@
 name:            http-api-data
-version:         0.3.8
+version:         0.3.8.1
 license:         BSD3
 license-file:    LICENSE
 author:          Nickolay Kudasov <[email protected]>
@@ -28,7 +28,7 @@ tested-with:
 
 custom-setup
   setup-depends:
-    base >= 4.7 && <4.11,
+    base >= 4.7 && <4.12,
     Cabal >= 1.18 && <2.3,
     cabal-doctest >=1.0.6 && <1.1
 
@@ -40,7 +40,7 @@ flag use-text-show
 library
     hs-source-dirs: src/
     include-dirs:   include/
-    build-depends:   base                  >= 4.7      && < 4.11
+    build-depends:   base                  >= 4.7      && < 4.12
                    , attoparsec            >= 0.13.0.1 && < 0.14
                    , attoparsec-iso8601    >= 1.0.0.0  && < 1.1
                    , bytestring            >= 0.10.4.0 && < 0.11
@@ -88,14 +88,14 @@ test-suite spec
                    , text
                    , time
                    , bytestring
-                   , uuid
+                   , uuid-types
 
 test-suite doctests
   ghc-options:      -Wall
   build-depends:
     base,
     directory >= 1.0,
-    doctest >= 0.11 && <0.14,
+    doctest >= 0.11 && <0.16,
     filepath
   default-language: Haskell2010
   hs-source-dirs:   test

test/Web/Internal/HttpApiDataSpec.hs

@@ -11,7 +11,7 @@ import qualified Data.Text.Lazy as L
 import qualified Data.ByteString as BS
 import Data.ByteString.Builder (toLazyByteString)
 import Data.Version
-import qualified Data.UUID as UUID
+import qualified Data.UUID.Types as UUID
 
 import Data.Proxy