Merge pull request #1229 from haskell-servant/servant-jsaddle-8.8

Build jsaddle with GHC-8.8
2019-09-30 15:59:44 +03:00 · 2019-09-30 15:59:44 +03:00 · d3aba7aac7
commit d3aba7aac7
parent 38f3da2499 71ca2a203c
8 changed files with 73 additions and 13 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -143,7 +143,7 @@ install:
    if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi
    if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi
    if ! $GHCJS ; then echo "packages: servant-pipes" >> cabal.project ; fi
-    if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: servant-jsaddle" >> cabal.project ; fi
+    echo "packages: servant-jsaddle" >> cabal.project
    if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi
    if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi
    if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi
@ -159,6 +159,7 @@ install:
    echo "constraints:  foundation >=0.0.14"               >> cabal.project
    echo "constraints:  memory <0.14.12 || >0.14.12"       >> cabal.project
    echo "constraints:  sqlite-simple < 0"                 >> cabal.project
+    echo "constraints:  base-compat ^>=0.11"               >> cabal.project
    echo "allow-newer:  aeson-pretty-0.8.7:base-compat"    >> cabal.project
    echo "allow-newer:  vault-0.3.1.2:hashable"            >> cabal.project
    echo "allow-newer:  psqueues-0.2.7.1:hashable"         >> cabal.project
@ -167,6 +168,18 @@ install:
    echo "allow-newer:  io-streams-1.5.1.0:network"        >> cabal.project
    echo "allow-newer:  io-streams-1.5.1.0:primitive"      >> cabal.project
    echo "allow-newer:  openssl-streams-1.2.2.0:network"   >> cabal.project
+    echo "allow-newer:  jsaddle-0.9.6.0:lens"              >> cabal.project
+    echo "allow-newer:  jsaddle-0.9.6.0:primitive"         >> cabal.project
+    echo "allow-newer:  jsaddle-0.9.6.0:time"              >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.1:base"          >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.1:base-compat"   >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.1:Cabal"         >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.1:lens"          >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.2:base"          >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.2:base-compat"   >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.2:Cabal"         >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.2:lens"          >> cabal.project
+    echo "allow-newer:  jsaddle-warp-0.9.6.0:time"         >> cabal.project
    echo "optimization: False"                             >> cabal.project
  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
  - cat cabal.project || true
@ -247,7 +260,7 @@ script:
    if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi
    if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi
    if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi
-    if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project ; fi
+    echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project
    if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi
    if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi
    if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi
@ -263,6 +276,7 @@ script:
    echo "constraints:  foundation >=0.0.14"               >> cabal.project
    echo "constraints:  memory <0.14.12 || >0.14.12"       >> cabal.project
    echo "constraints:  sqlite-simple < 0"                 >> cabal.project
+    echo "constraints:  base-compat ^>=0.11"               >> cabal.project
    echo "allow-newer:  aeson-pretty-0.8.7:base-compat"    >> cabal.project
    echo "allow-newer:  vault-0.3.1.2:hashable"            >> cabal.project
    echo "allow-newer:  psqueues-0.2.7.1:hashable"         >> cabal.project
@ -271,6 +285,18 @@ script:
    echo "allow-newer:  io-streams-1.5.1.0:network"        >> cabal.project
    echo "allow-newer:  io-streams-1.5.1.0:primitive"      >> cabal.project
    echo "allow-newer:  openssl-streams-1.2.2.0:network"   >> cabal.project
+    echo "allow-newer:  jsaddle-0.9.6.0:lens"              >> cabal.project
+    echo "allow-newer:  jsaddle-0.9.6.0:primitive"         >> cabal.project
+    echo "allow-newer:  jsaddle-0.9.6.0:time"              >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.1:base"          >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.1:base-compat"   >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.1:Cabal"         >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.1:lens"          >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.2:base"          >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.2:base-compat"   >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.2:Cabal"         >> cabal.project
+    echo "allow-newer:  jsaddle-dom-0.9.3.2:lens"          >> cabal.project
+    echo "allow-newer:  jsaddle-warp-0.9.6.0:time"         >> cabal.project
    echo "optimization: False"                             >> cabal.project
  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
  - cat cabal.project || true
--- a/cabal.project
+++ b/cabal.project
@ -38,8 +38,6 @@ packages:
  doc/cookbook/using-free-client
  -- doc/cookbook/open-id-connect

-
-
 tests: True
 optimization: False
 -- reorder-goals: True
@ -62,3 +60,19 @@ allow-newer: openssl-streams-1.2.2.0:network
 -- MonadFail
 -- https://github.com/nurpax/sqlite-simple/issues/74
 constraints: sqlite-simple < 0
+
+-- jsaddle
+allow-newer: jsaddle-0.9.6.0:lens
+allow-newer: jsaddle-0.9.6.0:primitive
+allow-newer: jsaddle-0.9.6.0:time
+allow-newer: jsaddle-dom-0.9.3.1:base
+allow-newer: jsaddle-dom-0.9.3.1:base-compat
+allow-newer: jsaddle-dom-0.9.3.1:Cabal
+allow-newer: jsaddle-dom-0.9.3.1:lens
+allow-newer: jsaddle-dom-0.9.3.2:base
+allow-newer: jsaddle-dom-0.9.3.2:base-compat
+allow-newer: jsaddle-dom-0.9.3.2:Cabal
+allow-newer: jsaddle-dom-0.9.3.2:lens
+allow-newer: jsaddle-warp-0.9.6.0:time
+
+constraints: base-compat ^>=0.11
--- a/servant-client/CHANGELOG.md
+++ b/servant-client/CHANGELOG.md
@ -1,6 +1,11 @@
 [The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md)
 [Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

+0.16.0.1
+--------
+
+- Allow `base-compat-0.11`
+
 0.16
 ----

--- a/servant-client/servant-client.cabal
+++ b/servant-client/servant-client.cabal
@ -1,6 +1,6 @@
 cabal-version:       >=1.10
 name:                servant-client
-version:             0.16
+version:             0.16.0.1

 synopsis:            Automatic derivation of querying functions for servant
 category:            Servant, Web
--- a/servant-client/src/Servant/Client/Internal/HttpClient.hs
+++ b/servant-client/src/Servant/Client/Internal/HttpClient.hs
@ -16,10 +16,11 @@ import           Prelude.Compat

 import           Control.Concurrent.MVar
                 (modifyMVar, newMVar)
-import qualified Data.ByteString                          as BS
 import           Control.Concurrent.STM.TVar
 import           Control.Exception
+                 (SomeException (..), catch)
 import           Control.Monad
+                 (unless)
 import           Control.Monad.Base
                 (MonadBase (..))
 import           Control.Monad.Catch
@ -27,15 +28,18 @@ import           Control.Monad.Catch
 import           Control.Monad.Error.Class
                 (MonadError (..))
 import           Control.Monad.IO.Class
-                 (liftIO)
+                 (MonadIO (..))
 import           Control.Monad.Reader
+                 (MonadReader, ReaderT, ask, runReaderT)
 import           Control.Monad.STM
                 (STM, atomically)
 import           Control.Monad.Trans.Control
                 (MonadBaseControl (..))
 import           Control.Monad.Trans.Except
+                 (ExceptT, runExceptT)
 import           Data.Bifunctor
                 (bimap)
+import qualified Data.ByteString             as BS
 import           Data.ByteString.Builder
                 (toLazyByteString)
 import qualified Data.ByteString.Lazy        as BSL
@ -64,8 +68,8 @@ import           Network.HTTP.Types
                 (hContentType, renderQuery, statusCode)
 import           Servant.Client.Core

-import qualified Servant.Types.SourceT                    as S
 import qualified Network.HTTP.Client         as Client
+import qualified Servant.Types.SourceT       as S

 -- | The environment in which a request is run.
 data ClientEnv
--- a/servant-http-streams/CHANGELOG.md
+++ b/servant-http-streams/CHANGELOG.md
@ -1,6 +1,11 @@
  [The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-http-streams/CHANGELOG.md)
 [Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

+0.16.0.1
+--------
+
+- Allow `base-compat-0.11`
+
 0.16
 ----

--- a/servant-http-streams/src/Servant/HttpStreams/Internal.hs
+++ b/servant-http-streams/src/Servant/HttpStreams/Internal.hs
@ -18,6 +18,8 @@ import           Control.DeepSeq
                 (NFData, force)
 import           Control.Exception
                 (IOException, SomeException (..), catch, evaluate, throwIO)
+import           Control.Monad
+                 (unless)
 import           Control.Monad.Base
                 (MonadBase (..))
 import           Control.Monad.Codensity
@ -25,9 +27,13 @@ import           Control.Monad.Codensity
 import           Control.Monad.Error.Class
                 (MonadError (..))
 import           Control.Monad.IO.Class
-                 (liftIO)
+                 (MonadIO (..))
 import           Control.Monad.Reader
+                 (MonadReader, ReaderT, ask, runReaderT)
+import           Control.Monad.Trans.Class
+                 (lift)
 import           Control.Monad.Trans.Except
+                 (ExceptT, runExceptT)
 import           Data.Bifunctor
                 (bimap, first)
 import           Data.ByteString.Builder
--- a/servant-jsaddle/servant-jsaddle.cabal
+++ b/servant-jsaddle/servant-jsaddle.cabal
@ -22,7 +22,7 @@ category:           Servant, Web
 build-type:         Simple
 cabal-version:      >=1.10
 tested-with:
-    GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5
+    GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1
  , GHCJS ==8.4

 homepage:           http://haskell-servant.readthedocs.org/
@ -46,7 +46,7 @@ library
  -- Bundled with GHC: Lower bound to not force re-installs
  -- text and mtl are bundled starting with GHC-8.4
  build-depends:
-      base          >=4.9      && <4.13
+      base          >=4.9      && <4.14
    , bytestring    >=0.10.8.1 && <0.11
    , containers    >=0.5.7.1  && <0.7
    , mtl           >=2.2.2    && <2.3
@ -60,10 +60,10 @@ library
  -- Strict dependency on `servant-client-core` as we re-export things.
  build-depends:    servant-client-core >=0.16 && <0.16.1
  build-depends:
-      base-compat         >=0.10.5  && <0.11
+      base-compat         >=0.10.5  && <0.12
    , case-insensitive    >=1.2.0.0 && <1.3
    , exceptions          >=0.10.0  && <0.11
-    , ghcjs-dom
+    , ghcjs-dom           >=0.9.4.0 && <0.10
    , http-media          >=0.7.1.3 && <0.9
    , http-types          >=0.12.2  && <0.13
    , jsaddle             >=0.9.6.0 && <0.10