4cc4641 · typeable/servant

git.iko.soy/typeable/servant

Allow warp-3.3 and singleton-bool-0.1.5

commit4cc4641dc12336df8cf3604e43b14824da46148c authorOleg Grenrus <oleg.grenrus@iki.fi> dateSat 3 Aug 2019, 14:37 (7 years ago) parente0d3f78

8 files changed+55−50

compare with master

unifiedsplit

.travis.yml+40−40 cabal.haskell-ci+2 cabal.project+5−2 servant-conduit/servant-conduit.cabal+1−1 servant-machines/servant-machines.cabal+1−1 servant-pipes/servant-pipes.cabal+1−1 servant-server/servant-server.cabal+3−3 servant/servant.cabal+2−2

.travis.yml+40−40

@@ -4,7 +4,7 @@

44#

55# For more information, see https://github.com/haskell-CI/haskell-ci

66#

7−# version: 0.3.20190521

7+# version: 0.3.20190730

88#

99language: c

1010dist: xenial

@@ -32,7 +32,7 @@ matrix:

3232 include:

3333 - compiler: ghc-8.8.1

3434 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}

35− env: GHCHEAD=true

35+ env: HEADHACKAGE=true

3636 - compiler: ghc-8.6.5

3737 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}

3838 - compiler: ghc-8.4.4

@@ -78,11 +78,12 @@ install:

7878 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

7979 - TEST=--enable-tests

8080 - BENCH=--enable-benchmarks

81− - GHCHEAD=${GHCHEAD-false}

81+ - HEADHACKAGE=${HEADHACKAGE-false}

8282 - rm -f $CABALHOME/config

8383 - |

8484 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config

8585 echo "remote-build-reporting: anonymous" >> $CABALHOME/config

86+ echo "write-ghc-environment-files: always" >> $CABALHOME/config

8687 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config

8788 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config

8889 echo "world-file: $CABALHOME/world" >> $CABALHOME/config

@@ -96,15 +97,14 @@ install:

9697 echo "repository hackage.haskell.org" >> $CABALHOME/config

9798 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

9899 - |

99− if $GHCHEAD; then

100+ if $HEADHACKAGE; then

100101 echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config

101−

102− echo "repository head.hackage" >> $CABALHOME/config

103− echo " url: http://head.hackage.haskell.org/" >> $CABALHOME/config

102+ echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config

103+ echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config

104104 echo " secure: True" >> $CABALHOME/config

105− echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config

106− echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config

107− echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config

105+ echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config

106+ echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config

107+ echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config

108108 echo " key-threshold: 3" >> $CABALHOME/config

109109 fi

110110 - |

@@ -142,21 +142,21 @@ install:

142142 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi

143143 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-free-client"' >> cabal.project ; fi

144144 - |

145− echo "constraints: foundation >=0.0.14" >> cabal.project

146− echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

147− echo "allow-newer: servant-quickcheck:servant" >> cabal.project

148− echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project

149− echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project

150− echo "allow-newer: servant-quickcheck:hspec" >> cabal.project

151− echo "allow-newer: servant-quickcheck:http-client" >> cabal.project

152− echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

153− echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

154− echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project

155− echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project

156− echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

157− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

158− echo "optimization: False" >> cabal.project

159− echo "write-ghc-environment-files: always" >> cabal.project

145+ echo "constraints: foundation >=0.0.14" >> cabal.project

146+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

147+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project

148+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project

149+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project

150+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project

151+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project

152+ echo "allow-newer: servant-quickcheck:warp" >> cabal.project

153+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

154+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

155+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project

156+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project

157+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

158+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

159+ echo "optimization: False" >> cabal.project

160160 - "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-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

161161 - cat cabal.project || true

162162 - cat cabal.project.local || true

@@ -227,21 +227,21 @@ script:

227227 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi

228228 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi

229229 - |

230− echo "constraints: foundation >=0.0.14" >> cabal.project

231− echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

232− echo "allow-newer: servant-quickcheck:servant" >> cabal.project

233− echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project

234− echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project

235− echo "allow-newer: servant-quickcheck:hspec" >> cabal.project

236− echo "allow-newer: servant-quickcheck:http-client" >> cabal.project

237− echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

238− echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

239− echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project

240− echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project

241− echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

242− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

243− echo "optimization: False" >> cabal.project

244− echo "write-ghc-environment-files: always" >> cabal.project

230+ echo "constraints: foundation >=0.0.14" >> cabal.project

231+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

232+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project

233+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project

234+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project

235+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project

236+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project

237+ echo "allow-newer: servant-quickcheck:warp" >> cabal.project

238+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

239+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

240+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project

241+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project

242+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

243+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

244+ echo "optimization: False" >> cabal.project

245245 - "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-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

246246 - cat cabal.project || true

247247 - cat cabal.project.local || true

cabal.haskell-ci+2

@@ -20,3 +20,5 @@ constraint-set http-media-0.8

2020

2121constraint-set http-media-0.7

2222 constraints: http-media ==0.7.*

23+

24+head-hackage: >= 8.8

cabal.project+5−2

@@ -48,9 +48,12 @@ allow-newer:

4848

4949-- servant-quickcheck

5050allow-newer:

51− servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,

51+ servant-quickcheck:servant,

52+ servant-quickcheck:servant-client,

53+ servant-quickcheck:servant-server,

5254 servant-quickcheck:hspec,

53− servant-quickcheck:http-client

55+ servant-quickcheck:http-client,

56+ servant-quickcheck:warp

5457

5558-- constraints: semigroups ^>=0.19

5659-- constraints: hashable ^>=1.3

servant-conduit/servant-conduit.cabal+1−1

@@ -62,6 +62,6 @@ test-suite example

6262 , servant-server >=0.15 && <0.17

6363 , servant-client >=0.15 && <0.17

6464 , wai >=3.2.1.2 && <3.3

65− , warp >=3.2.25 && <3.3

65+ , warp >=3.2.25 && <3.4

6666 , http-client

6767 default-language: Haskell2010

servant-machines/servant-machines.cabal+1−1

@@ -59,6 +59,6 @@ test-suite example

5959 , servant-server >=0.15 && <0.17

6060 , servant-client >=0.15 && <0.17

6161 , wai >=3.2.1.2 && <3.3

62− , warp >=3.2.25 && <3.3

62+ , warp >=3.2.25 && <3.4

6363 , http-client

6464 default-language: Haskell2010

servant-pipes/servant-pipes.cabal+1−1

@@ -63,6 +63,6 @@ test-suite example

6363 , servant-server >=0.15 && <0.17

6464 , servant-client >=0.15 && <0.17

6565 , wai >=3.2.1.2 && <3.3

66− , warp >=3.2.25 && <3.3

66+ , warp >=3.2.25 && <3.4

6767 , http-client

6868 default-language: Haskell2010

servant-server/servant-server.cabal+3−3

@@ -1,6 +1,6 @@

11cabal-version: >=1.10

22name: servant-server

3−version: 0.16.1

3+version: 0.16.2

55synopsis: A family of combinators for defining webservices APIs and serving them

66category: Servant, Web

@@ -80,7 +80,7 @@ library

8080 -- Servant dependencies

8181 -- strict dependency as we re-export 'servant' things.

8282 build-depends:

83− servant >= 0.16.1 && < 0.16.2

83+ servant >= 0.16.2 && < 0.16.3

8484 , http-api-data >= 0.4.1 && < 0.4.2

8585

8686 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

@@ -121,7 +121,7 @@ executable greet

121121

122122 build-depends:

123123 aeson >= 1.4.1.0 && < 1.5

124− , warp >= 3.2.25 && < 3.3

124+ , warp >= 3.2.25 && < 3.4

125125

126126test-suite spec

127127 type: exitcode-stdio-1.0

servant/servant.cabal+2−2

@@ -1,6 +1,6 @@

11cabal-version: >=1.10

22name: servant

3−version: 0.16.1

3+version: 0.16.2

55synopsis: A family of combinators for defining webservices APIs

66category: Servant, Web

@@ -100,7 +100,7 @@ library

100100 -- i.e. re-export, or allow using without direct dependency

101101 build-depends:

102102 http-api-data >= 0.4.1 && < 0.4.2

103− , singleton-bool >= 0.1.4 && < 0.1.5

103+ , singleton-bool >= 0.1.5 && < 0.1.6

104104

105105 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

106106 -- Here can be exceptions if we really need features from the newer versions.