Skip to content

Commit d3aba7a

Browse files
phadejphadej
authored
Merge pull request #1229 from haskell-servant/servant-jsaddle-8.8
Build jsaddle with GHC-8.8
2 parents 38f3da2 + 71ca2a2 commit d3aba7a

File tree

8 files changed

+73
-13
lines changed

8 files changed

+73
-13
lines changed

‎.travis.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ install:
143143
if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi
144144
if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi
145145
if ! $GHCJS ; then echo "packages: servant-pipes" >> cabal.project ; fi
146-
if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: servant-jsaddle" >> cabal.project ; fi
146+
echo "packages: servant-jsaddle" >> cabal.project
147147
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi
148148
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi
149149
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi
@@ -159,6 +159,7 @@ install:
159159
echo "constraints: foundation >=0.0.14" >> cabal.project
160160
echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
161161
echo "constraints: sqlite-simple < 0" >> cabal.project
162+
echo "constraints: base-compat ^>=0.11" >> cabal.project
162163
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
163164
echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
164165
echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
@@ -167,6 +168,18 @@ install:
167168
echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
168169
echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
169170
echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
171+
echo "allow-newer: jsaddle-0.9.6.0:lens" >> cabal.project
172+
echo "allow-newer: jsaddle-0.9.6.0:primitive" >> cabal.project
173+
echo "allow-newer: jsaddle-0.9.6.0:time" >> cabal.project
174+
echo "allow-newer: jsaddle-dom-0.9.3.1:base" >> cabal.project
175+
echo "allow-newer: jsaddle-dom-0.9.3.1:base-compat" >> cabal.project
176+
echo "allow-newer: jsaddle-dom-0.9.3.1:Cabal" >> cabal.project
177+
echo "allow-newer: jsaddle-dom-0.9.3.1:lens" >> cabal.project
178+
echo "allow-newer: jsaddle-dom-0.9.3.2:base" >> cabal.project
179+
echo "allow-newer: jsaddle-dom-0.9.3.2:base-compat" >> cabal.project
180+
echo "allow-newer: jsaddle-dom-0.9.3.2:Cabal" >> cabal.project
181+
echo "allow-newer: jsaddle-dom-0.9.3.2:lens" >> cabal.project
182+
echo "allow-newer: jsaddle-warp-0.9.6.0:time" >> cabal.project
170183
echo "optimization: False" >> cabal.project
171184
- "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"
172185
- cat cabal.project || true
@@ -247,7 +260,7 @@ script:
247260
if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi
248261
if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi
249262
if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi
250-
if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project ; fi
263+
echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project
251264
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi
252265
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi
253266
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi
@@ -263,6 +276,7 @@ script:
263276
echo "constraints: foundation >=0.0.14" >> cabal.project
264277
echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
265278
echo "constraints: sqlite-simple < 0" >> cabal.project
279+
echo "constraints: base-compat ^>=0.11" >> cabal.project
266280
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
267281
echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
268282
echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
@@ -271,6 +285,18 @@ script:
271285
echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
272286
echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
273287
echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
288+
echo "allow-newer: jsaddle-0.9.6.0:lens" >> cabal.project
289+
echo "allow-newer: jsaddle-0.9.6.0:primitive" >> cabal.project
290+
echo "allow-newer: jsaddle-0.9.6.0:time" >> cabal.project
291+
echo "allow-newer: jsaddle-dom-0.9.3.1:base" >> cabal.project
292+
echo "allow-newer: jsaddle-dom-0.9.3.1:base-compat" >> cabal.project
293+
echo "allow-newer: jsaddle-dom-0.9.3.1:Cabal" >> cabal.project
294+
echo "allow-newer: jsaddle-dom-0.9.3.1:lens" >> cabal.project
295+
echo "allow-newer: jsaddle-dom-0.9.3.2:base" >> cabal.project
296+
echo "allow-newer: jsaddle-dom-0.9.3.2:base-compat" >> cabal.project
297+
echo "allow-newer: jsaddle-dom-0.9.3.2:Cabal" >> cabal.project
298+
echo "allow-newer: jsaddle-dom-0.9.3.2:lens" >> cabal.project
299+
echo "allow-newer: jsaddle-warp-0.9.6.0:time" >> cabal.project
274300
echo "optimization: False" >> cabal.project
275301
- "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"
276302
- cat cabal.project || true

‎cabal.project

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ packages:
3838
doc/cookbook/using-free-client
3939
-- doc/cookbook/open-id-connect
4040

41-
42-
4341
tests: True
4442
optimization: False
4543
-- reorder-goals: True
@@ -62,3 +60,19 @@ allow-newer: openssl-streams-1.2.2.0:network
6260
-- MonadFail
6361
-- https://github.com/nurpax/sqlite-simple/issues/74
6462
constraints: sqlite-simple < 0
63+
64+
-- jsaddle
65+
allow-newer: jsaddle-0.9.6.0:lens
66+
allow-newer: jsaddle-0.9.6.0:primitive
67+
allow-newer: jsaddle-0.9.6.0:time
68+
allow-newer: jsaddle-dom-0.9.3.1:base
69+
allow-newer: jsaddle-dom-0.9.3.1:base-compat
70+
allow-newer: jsaddle-dom-0.9.3.1:Cabal
71+
allow-newer: jsaddle-dom-0.9.3.1:lens
72+
allow-newer: jsaddle-dom-0.9.3.2:base
73+
allow-newer: jsaddle-dom-0.9.3.2:base-compat
74+
allow-newer: jsaddle-dom-0.9.3.2:Cabal
75+
allow-newer: jsaddle-dom-0.9.3.2:lens
76+
allow-newer: jsaddle-warp-0.9.6.0:time
77+
78+
constraints: base-compat ^>=0.11

‎servant-client/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md)
22
[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33

4+
0.16.0.1
5+
--------
6+
7+
- Allow `base-compat-0.11`
8+
49
0.16
510
----
611

‎servant-client/servant-client.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: >=1.10
22
name: servant-client
3-
version: 0.16
3+
version: 0.16.0.1
44

55
synopsis: Automatic derivation of querying functions for servant
66
category: Servant, Web

‎servant-client/src/Servant/Client/Internal/HttpClient.hs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,30 @@ import Prelude.Compat
1616

1717
import Control.Concurrent.MVar
1818
(modifyMVar, newMVar)
19-
import qualified Data.ByteString as BS
2019
import Control.Concurrent.STM.TVar
2120
import Control.Exception
21+
(SomeException (..), catch)
2222
import Control.Monad
23+
(unless)
2324
import Control.Monad.Base
2425
(MonadBase (..))
2526
import Control.Monad.Catch
2627
(MonadCatch, MonadThrow)
2728
import Control.Monad.Error.Class
2829
(MonadError (..))
2930
import Control.Monad.IO.Class
30-
(liftIO)
31+
(MonadIO (..))
3132
import Control.Monad.Reader
33+
(MonadReader, ReaderT, ask, runReaderT)
3234
import Control.Monad.STM
3335
(STM, atomically)
3436
import Control.Monad.Trans.Control
3537
(MonadBaseControl (..))
3638
import Control.Monad.Trans.Except
39+
(ExceptT, runExceptT)
3740
import Data.Bifunctor
3841
(bimap)
42+
import qualified Data.ByteString as BS
3943
import Data.ByteString.Builder
4044
(toLazyByteString)
4145
import qualified Data.ByteString.Lazy as BSL
@@ -64,8 +68,8 @@ import Network.HTTP.Types
6468
(hContentType, renderQuery, statusCode)
6569
import Servant.Client.Core
6670

67-
import qualified Servant.Types.SourceT as S
6871
import qualified Network.HTTP.Client as Client
72+
import qualified Servant.Types.SourceT as S
6973

7074
-- | The environment in which a request is run.
7175
data ClientEnv

‎servant-http-streams/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-http-streams/CHANGELOG.md)
22
[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33

4+
0.16.0.1
5+
--------
6+
7+
- Allow `base-compat-0.11`
8+
49
0.16
510
----
611

‎servant-http-streams/src/Servant/HttpStreams/Internal.hs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,22 @@ import Control.DeepSeq
1818
(NFData, force)
1919
import Control.Exception
2020
(IOException, SomeException (..), catch, evaluate, throwIO)
21+
import Control.Monad
22+
(unless)
2123
import Control.Monad.Base
2224
(MonadBase (..))
2325
import Control.Monad.Codensity
2426
(Codensity (..))
2527
import Control.Monad.Error.Class
2628
(MonadError (..))
2729
import Control.Monad.IO.Class
28-
(liftIO)
30+
(MonadIO (..))
2931
import Control.Monad.Reader
32+
(MonadReader, ReaderT, ask, runReaderT)
33+
import Control.Monad.Trans.Class
34+
(lift)
3035
import Control.Monad.Trans.Except
36+
(ExceptT, runExceptT)
3137
import Data.Bifunctor
3238
(bimap, first)
3339
import Data.ByteString.Builder

‎servant-jsaddle/servant-jsaddle.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ category: Servant, Web
2222
build-type: Simple
2323
cabal-version: >=1.10
2424
tested-with:
25-
GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5
25+
GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1
2626
, GHCJS ==8.4
2727

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

0 commit comments

Comments
 (0)