Merge pull request #73 from jprider63/ghc-8.8.2

Support for ghc 8.8.2

.travis.yml

@@ -43,6 +43,10 @@ env:
     - DOCKER_VERSION="1.13.1-0~ubuntu-trusty"       GHCVER=8.6.4
     - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty"   GHCVER=8.6.4
 
+    - DOCKER_VERSION="1.12.3-0~trusty"              GHCVER=8.8.2
+    - DOCKER_VERSION="1.13.1-0~ubuntu-trusty"       GHCVER=8.8.2
+    - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty"   GHCVER=8.8.2
+
 addons:
   apt:
     packages:

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.6.0.3 (2020-02-17)
+
+- Support for ghc 8.8.2.
+- Bump dependency version. 
+- Use MonadFail for later versions.
+
 ## 0.6.0.1 (2019-05-23)
 
 - Support ghc 8.6.4.

docker.cabal

@@ -1,5 +1,5 @@
 name:                docker
-version:             0.6.0.2
+version:             0.6.0.3
 synopsis:            An API client for docker written in Haskell
 description:         See API documentation below.
 homepage:            https://github.com/denibertovic/docker-hs
@@ -30,7 +30,7 @@ library
                      , bytestring >= 0.10.0 && < 0.11.0
                      , containers >= 0.5.0 && < 0.7.0
                      , data-default-class >= 0.0.1 && < 0.2.0
-                     , http-client >= 0.4.0 && < 0.6.0
+                     , http-client >= 0.4.0 && < 0.7.0
                      , http-types >= 0.9 && < 0.13
                      , vector
                      , conduit
@@ -51,9 +51,9 @@ library
                      , mtl >= 2.0.0 && < 3.0.0
                      , network >= 2.6.0
                      , text >= 1.0.0 && < 2.0.0
-                     , time >= 1.5.0 && < 1.9.0
+                     , time >= 1.5.0 && < 2.0.0
                      , scientific >= 0.3.0 && < 0.4.0
-                     , tls >= 1.3.7 && < 1.5.0
+                     , tls >= 1.3.7 && < 1.6.0
                      , unordered-containers >= 0.2.0 && < 0.3.0
                      , x509 >= 1.6.0 && < 1.8.0
                      , x509-store >= 1.6.0 && < 1.8.0

src/Docker/Client/Types.hs

@@ -1564,7 +1564,11 @@ instance FromJSON ContainerConfig where
             macAddress labels stopSignal
     parseJSON _ = fail "NetworkSettings is not an object."
 
+#if MIN_VERSION_base(4,13,0)
+parseIntegerText :: (MonadFail m) => Text -> m Integer
+#else
 parseIntegerText :: (Monad m) => Text -> m Integer
+#endif
 parseIntegerText t = case readMaybe $ T.unpack t of
     Nothing ->
         fail "Could not parse Integer"

stack-8.8.2.yaml

@@ -0,0 +1,5 @@
+resolver: lts-15.0
+packages:
+- '.'
+extra-deps: []
+