164f757 · servant · git.iko.soy

git.iko.soy/servant

on master help sign in

Merge pull request #1224 from haskell-servant/forward-8.8

164f757Oleg Grenrus7 years ago

.travis.yml+45−27

compare with master

unifiedsplit

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

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

7−# version: 0.5.20190908

7+# version: 0.5.20190916

9language: c

10dist: xenial

@@ -33,6 +33,8 @@ matrix:

33 include:

34 - compiler: ghcjs-8.4

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

36+ - compiler: ghc-8.8.1

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

36 - compiler: ghc-8.6.5

38 - compiler: ghc-8.6.5

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

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

38 - compiler: ghc-8.4.4

40 - compiler: ghc-8.4.4

@@ -124,7 +126,7 @@ install:

124 - cat $CABALHOME/config

126 - cat $CABALHOME/config

125 - rm -fv cabal.project cabal.project.local cabal.project.freeze

127 - rm -fv cabal.project cabal.project.local cabal.project.freeze

126 - travis_retry ${CABAL} v2-update -v

128 - travis_retry ${CABAL} v2-update -v

127− - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 cabal-plan | color_cabal_output) ; fi

129+ - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 cabal-plan --constraint='cabal-plan ^>=0.6.0.0' --constraint='cabal-plan +exe' | color_cabal_output) ; fi

128 - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 hspec-discover | color_cabal_output) ; fi

130 - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 hspec-discover | color_cabal_output) ; fi

129 # Generate cabal.project

131 # Generate cabal.project

130 - rm -rf cabal.project cabal.project.local cabal.project.freeze

132 - rm -rf cabal.project cabal.project.local cabal.project.freeze

@@ -132,7 +134,6 @@ install:

132 - |

134 - |

133 echo "packages: servant" >> cabal.project

135 echo "packages: servant" >> cabal.project

134 if ! $GHCJS ; then echo "packages: servant-client" >> cabal.project ; fi

136 if ! $GHCJS ; then echo "packages: servant-client" >> cabal.project ; fi

135− echo "packages: servant-jsaddle" >> cabal.project

136 echo "packages: servant-client-core" >> cabal.project

137 echo "packages: servant-client-core" >> cabal.project

137 if ! $GHCJS ; then echo "packages: servant-http-streams" >> cabal.project ; fi

138 if ! $GHCJS ; then echo "packages: servant-http-streams" >> cabal.project ; fi

138 if ! $GHCJS ; then echo "packages: servant-docs" >> cabal.project ; fi

139 if ! $GHCJS ; then echo "packages: servant-docs" >> cabal.project ; fi

@@ -142,14 +143,13 @@ install:

142 if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi

143 if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi

143 if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi

144 if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi

144 if ! $GHCJS ; then echo "packages: servant-pipes" >> cabal.project ; fi

145 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

145 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi

147 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi

146 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi

148 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi

147 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi

149 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi

148 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-postgres-pool" >> cabal.project ; fi

150 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-postgres-pool" >> cabal.project ; fi

149− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-sqlite-simple" >> cabal.project ; fi

150 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/file-upload" >> cabal.project ; fi

151 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/file-upload" >> cabal.project ; fi

151 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/generic" >> cabal.project ; fi

152 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/generic" >> cabal.project ; fi

152− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/https" >> cabal.project ; fi

153 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/pagination" >> cabal.project ; fi

154 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/testing" >> cabal.project ; fi

155 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/structuring-apis" >> cabal.project ; fi

@@ -158,24 +158,21 @@ install:

158 - |

159 echo "constraints: foundation >=0.0.14" >> cabal.project

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

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

161+ echo "constraints: sqlite-simple < 0" >> cabal.project

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

162+ echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project

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

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

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

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

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

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

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

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

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

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

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

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

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

168+ echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project

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

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

172 echo "optimization: False" >> cabal.project

170 echo "optimization: False" >> cabal.project

173− - "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-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

171+ - "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"

174 - cat cabal.project || true

172 - cat cabal.project || true

175 - cat cabal.project.local || true

173 - cat cabal.project.local || true

176 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi

174 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi

177 - if [ -f "servant-client/configure.ac" ]; then (cd "servant-client" && autoreconf -i); fi

175 - if [ -f "servant-client/configure.ac" ]; then (cd "servant-client" && autoreconf -i); fi

178− - if [ -f "servant-jsaddle/configure.ac" ]; then (cd "servant-jsaddle" && autoreconf -i); fi

179 - if [ -f "servant-client-core/configure.ac" ]; then (cd "servant-client-core" && autoreconf -i); fi

176 - if [ -f "servant-client-core/configure.ac" ]; then (cd "servant-client-core" && autoreconf -i); fi

180 - if [ -f "servant-http-streams/configure.ac" ]; then (cd "servant-http-streams" && autoreconf -i); fi

177 - if [ -f "servant-http-streams/configure.ac" ]; then (cd "servant-http-streams" && autoreconf -i); fi

181 - if [ -f "servant-docs/configure.ac" ]; then (cd "servant-docs" && autoreconf -i); fi

178 - if [ -f "servant-docs/configure.ac" ]; then (cd "servant-docs" && autoreconf -i); fi

@@ -185,14 +182,13 @@ install:

185 - if [ -f "servant-machines/configure.ac" ]; then (cd "servant-machines" && autoreconf -i); fi

182 - if [ -f "servant-machines/configure.ac" ]; then (cd "servant-machines" && autoreconf -i); fi

186 - if [ -f "servant-conduit/configure.ac" ]; then (cd "servant-conduit" && autoreconf -i); fi

183 - if [ -f "servant-conduit/configure.ac" ]; then (cd "servant-conduit" && autoreconf -i); fi

187 - if [ -f "servant-pipes/configure.ac" ]; then (cd "servant-pipes" && autoreconf -i); fi

184 - if [ -f "servant-pipes/configure.ac" ]; then (cd "servant-pipes" && autoreconf -i); fi

185+ - if [ -f "servant-jsaddle/configure.ac" ]; then (cd "servant-jsaddle" && autoreconf -i); fi

188 - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then (cd "doc/cookbook/basic-auth" && autoreconf -i); fi

186 - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then (cd "doc/cookbook/basic-auth" && autoreconf -i); fi

189 - if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then (cd "doc/cookbook/curl-mock" && autoreconf -i); fi

187 - if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then (cd "doc/cookbook/curl-mock" && autoreconf -i); fi

190 - if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then (cd "doc/cookbook/basic-streaming" && autoreconf -i); fi

188 - if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then (cd "doc/cookbook/basic-streaming" && autoreconf -i); fi

191 - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then (cd "doc/cookbook/db-postgres-pool" && autoreconf -i); fi

189 - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then (cd "doc/cookbook/db-postgres-pool" && autoreconf -i); fi

192− - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i); fi

193 - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi

190 - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi

194 - if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi

191 - if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi

195− - if [ -f "doc/cookbook/https/configure.ac" ]; then (cd "doc/cookbook/https" && autoreconf -i); fi

196 - if [ -f "doc/cookbook/pagination/configure.ac" ]; then (cd "doc/cookbook/pagination" && autoreconf -i); fi

192 - if [ -f "doc/cookbook/pagination/configure.ac" ]; then (cd "doc/cookbook/pagination" && autoreconf -i); fi

197 - if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi

193 - if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi

198 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi

194 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi

@@ -215,7 +211,6 @@ script:

215 - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;

211 - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;

216 - PKGDIR_servant="$(find . -maxdepth 1 -type d -regex '.*/servant-[0-9.]*')"

212 - PKGDIR_servant="$(find . -maxdepth 1 -type d -regex '.*/servant-[0-9.]*')"

217 - PKGDIR_servant_client="$(find . -maxdepth 1 -type d -regex '.*/servant-client-[0-9.]*')"

213 - PKGDIR_servant_client="$(find . -maxdepth 1 -type d -regex '.*/servant-client-[0-9.]*')"

218− - PKGDIR_servant_jsaddle="$(find . -maxdepth 1 -type d -regex '.*/servant-jsaddle-[0-9.]*')"

219 - PKGDIR_servant_client_core="$(find . -maxdepth 1 -type d -regex '.*/servant-client-core-[0-9.]*')"

214 - PKGDIR_servant_client_core="$(find . -maxdepth 1 -type d -regex '.*/servant-client-core-[0-9.]*')"

220 - PKGDIR_servant_http_streams="$(find . -maxdepth 1 -type d -regex '.*/servant-http-streams-[0-9.]*')"

215 - PKGDIR_servant_http_streams="$(find . -maxdepth 1 -type d -regex '.*/servant-http-streams-[0-9.]*')"

221 - PKGDIR_servant_docs="$(find . -maxdepth 1 -type d -regex '.*/servant-docs-[0-9.]*')"

216 - PKGDIR_servant_docs="$(find . -maxdepth 1 -type d -regex '.*/servant-docs-[0-9.]*')"

@@ -225,14 +220,13 @@ script:

225 - PKGDIR_servant_machines="$(find . -maxdepth 1 -type d -regex '.*/servant-machines-[0-9.]*')"

220 - PKGDIR_servant_machines="$(find . -maxdepth 1 -type d -regex '.*/servant-machines-[0-9.]*')"

226 - PKGDIR_servant_conduit="$(find . -maxdepth 1 -type d -regex '.*/servant-conduit-[0-9.]*')"

221 - PKGDIR_servant_conduit="$(find . -maxdepth 1 -type d -regex '.*/servant-conduit-[0-9.]*')"

227 - PKGDIR_servant_pipes="$(find . -maxdepth 1 -type d -regex '.*/servant-pipes-[0-9.]*')"

222 - PKGDIR_servant_pipes="$(find . -maxdepth 1 -type d -regex '.*/servant-pipes-[0-9.]*')"

223+ - PKGDIR_servant_jsaddle="$(find . -maxdepth 1 -type d -regex '.*/servant-jsaddle-[0-9.]*')"

228 - PKGDIR_cookbook_basic_auth="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-auth-[0-9.]*')"

224 - PKGDIR_cookbook_basic_auth="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-auth-[0-9.]*')"

229 - PKGDIR_cookbook_curl_mock="$(find . -maxdepth 1 -type d -regex '.*/cookbook-curl-mock-[0-9.]*')"

225 - PKGDIR_cookbook_curl_mock="$(find . -maxdepth 1 -type d -regex '.*/cookbook-curl-mock-[0-9.]*')"

230 - PKGDIR_cookbook_basic_streaming="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-streaming-[0-9.]*')"

226 - PKGDIR_cookbook_basic_streaming="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-streaming-[0-9.]*')"

231 - PKGDIR_cookbook_db_postgres_pool="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-postgres-pool-[0-9.]*')"

227 - PKGDIR_cookbook_db_postgres_pool="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-postgres-pool-[0-9.]*')"

232− - PKGDIR_cookbook_db_sqlite_simple="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-sqlite-simple-[0-9.]*')"

233 - PKGDIR_cookbook_file_upload="$(find . -maxdepth 1 -type d -regex '.*/cookbook-file-upload-[0-9.]*')"

228 - PKGDIR_cookbook_file_upload="$(find . -maxdepth 1 -type d -regex '.*/cookbook-file-upload-[0-9.]*')"

234 - PKGDIR_cookbook_generic="$(find . -maxdepth 1 -type d -regex '.*/cookbook-generic-[0-9.]*')"

229 - PKGDIR_cookbook_generic="$(find . -maxdepth 1 -type d -regex '.*/cookbook-generic-[0-9.]*')"

235− - PKGDIR_cookbook_https="$(find . -maxdepth 1 -type d -regex '.*/cookbook-https-[0-9.]*')"

236 - PKGDIR_cookbook_pagination="$(find . -maxdepth 1 -type d -regex '.*/cookbook-pagination-[0-9.]*')"

230 - PKGDIR_cookbook_pagination="$(find . -maxdepth 1 -type d -regex '.*/cookbook-pagination-[0-9.]*')"

237 - PKGDIR_cookbook_testing="$(find . -maxdepth 1 -type d -regex '.*/cookbook-testing-[0-9.]*')"

231 - PKGDIR_cookbook_testing="$(find . -maxdepth 1 -type d -regex '.*/cookbook-testing-[0-9.]*')"

238 - PKGDIR_cookbook_structuring_apis="$(find . -maxdepth 1 -type d -regex '.*/cookbook-structuring-apis-[0-9.]*')"

232 - PKGDIR_cookbook_structuring_apis="$(find . -maxdepth 1 -type d -regex '.*/cookbook-structuring-apis-[0-9.]*')"

@@ -244,7 +238,6 @@ script:

244 - |

238 - |

245 echo "packages: ${PKGDIR_servant}" >> cabal.project

239 echo "packages: ${PKGDIR_servant}" >> cabal.project

246 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_client}" >> cabal.project ; fi

240 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_client}" >> cabal.project ; fi

247− echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project

248 echo "packages: ${PKGDIR_servant_client_core}" >> cabal.project

241 echo "packages: ${PKGDIR_servant_client_core}" >> cabal.project

249 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_http_streams}" >> cabal.project ; fi

242 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_http_streams}" >> cabal.project ; fi

250 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_docs}" >> cabal.project ; fi

243 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_docs}" >> cabal.project ; fi

@@ -254,14 +247,13 @@ script:

254 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi

247 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi

255 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi

248 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi

256 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi

249 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

257 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi

251 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi

258 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi

252 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi

259 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi

253 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi

260 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_postgres_pool}" >> cabal.project ; fi

254 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_postgres_pool}" >> cabal.project ; fi

261− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_sqlite_simple}" >> cabal.project ; fi

262 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_file_upload}" >> cabal.project ; fi

255 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_file_upload}" >> cabal.project ; fi

263 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_generic}" >> cabal.project ; fi

256 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_generic}" >> cabal.project ; fi

264− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_https}" >> cabal.project ; fi

265 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_pagination}" >> cabal.project ; fi

257 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_pagination}" >> cabal.project ; fi

266 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_testing}" >> cabal.project ; fi

258 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_testing}" >> cabal.project ; fi

267 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_structuring_apis}" >> cabal.project ; fi

259 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_structuring_apis}" >> cabal.project ; fi

@@ -270,21 +262,47 @@ script:

270 - |

262 - |

271 echo "constraints: foundation >=0.0.14" >> cabal.project

263 echo "constraints: foundation >=0.0.14" >> cabal.project

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

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

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

265+ echo "constraints: sqlite-simple < 0" >> cabal.project

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

266+ echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project

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

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

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

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

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

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

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

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

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

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

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

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

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

272+ echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project

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

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

284 echo "optimization: False" >> cabal.project

274 echo "optimization: False" >> cabal.project

285− - "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-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

275+ - "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"

286 - cat cabal.project || true

276 - cat cabal.project || true

287 - cat cabal.project.local || true

277 - cat cabal.project.local || true

278+ - |

279+ pkgdir() {

280+ case $1 in

281+ servant) echo ${PKGDIR_servant} ;;

282+ servant-client) echo ${PKGDIR_servant_client} ;;

283+ servant-client-core) echo ${PKGDIR_servant_client_core} ;;

284+ servant-http-streams) echo ${PKGDIR_servant_http_streams} ;;

285+ servant-docs) echo ${PKGDIR_servant_docs} ;;

286+ servant-foreign) echo ${PKGDIR_servant_foreign} ;;

287+ servant-server) echo ${PKGDIR_servant_server} ;;

288+ tutorial) echo ${PKGDIR_tutorial} ;;

289+ servant-machines) echo ${PKGDIR_servant_machines} ;;

290+ servant-conduit) echo ${PKGDIR_servant_conduit} ;;

291+ servant-pipes) echo ${PKGDIR_servant_pipes} ;;

292+ servant-jsaddle) echo ${PKGDIR_servant_jsaddle} ;;

293+ cookbook-basic-auth) echo ${PKGDIR_cookbook_basic_auth} ;;

294+ cookbook-curl-mock) echo ${PKGDIR_cookbook_curl_mock} ;;

295+ cookbook-basic-streaming) echo ${PKGDIR_cookbook_basic_streaming} ;;

296+ cookbook-db-postgres-pool) echo ${PKGDIR_cookbook_db_postgres_pool} ;;

297+ cookbook-file-upload) echo ${PKGDIR_cookbook_file_upload} ;;

298+ cookbook-generic) echo ${PKGDIR_cookbook_generic} ;;

299+ cookbook-pagination) echo ${PKGDIR_cookbook_pagination} ;;

300+ cookbook-testing) echo ${PKGDIR_cookbook_testing} ;;

301+ cookbook-structuring-apis) echo ${PKGDIR_cookbook_structuring_apis} ;;

302+ cookbook-using-custom-monad) echo ${PKGDIR_cookbook_using_custom_monad} ;;

303+ cookbook-using-free-client) echo ${PKGDIR_cookbook_using_free_client} ;;

304+ esac

305+ }

288 - echo -en 'travis_fold:end:unpack\\r'

306 - echo -en 'travis_fold:end:unpack\\r'

289 # Building with tests and benchmarks...

307 # Building with tests and benchmarks...

290 - echo 'Building with tests and benchmarks...' && echo -en 'travis_fold:start:build-everything\\r'

308 - echo 'Building with tests and benchmarks...' && echo -en 'travis_fold:start:build-everything\\r'

@@ -293,7 +311,7 @@ script:

293 - echo -en 'travis_fold:end:build-everything\\r'

311 - echo -en 'travis_fold:end:build-everything\\r'

294 # Testing...

312 # Testing...

295 - if ! $GHCJS ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi

313 - if ! $GHCJS ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi

296− - if $GHCJS ; then for testexe in $(cabal-plan list-bins '*:test:*' | awk '{ print $2 }'); do echo $testexe; nodejs ${testexe}.jsexe/all.js; done ; fi

314+ - if $GHCJS ; then cabal-plan list-bins '*:test:*' | while read -r line; do testpkg=$(echo "$line" | perl -pe 's/:.*//'); testexe=$(echo "$line" | awk '{ print $2 }'); echo "testing $textexe in package $textpkg"; (cd "$(pkgdir $testpkg)" && nodejs "$testexe".jsexe/all.js); done ; fi

297 # haddock...

315 # haddock...

298 - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'

316 - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'

299 - if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output ; fi

317 - if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output ; fi

cabal.project+15−20

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

1packages:

2 servant/

3 servant-client/

4− servant-jsaddle/

5 servant-client-core/

4 servant-client-core/

6 servant-http-streams/

5 servant-http-streams/

7 servant-docs/

6 servant-docs/

@@ -9,21 +8,27 @@ packages:

9 servant-server/

8 servant-server/

10 doc/tutorial/

9 doc/tutorial/

11+-- servant streaming

12+packages:

12 servant-machines/

13 servant-machines/

13 servant-conduit/

14 servant-conduit/

14 servant-pipes/

15 servant-pipes/

16− -- doc/cookbook/*/*.cabal

17+-- servant GHCJS

18+packages:

19+ servant-jsaddle/

21+-- Cookbooks

22+packages:

18 doc/cookbook/basic-auth

23 doc/cookbook/basic-auth

19 doc/cookbook/curl-mock

24 doc/cookbook/curl-mock

20 doc/cookbook/basic-streaming

25 doc/cookbook/basic-streaming

21 doc/cookbook/db-postgres-pool

26 doc/cookbook/db-postgres-pool

22− doc/cookbook/db-sqlite-simple

27+-- doc/cookbook/db-sqlite-simple

23 doc/cookbook/file-upload

28 doc/cookbook/file-upload

24 doc/cookbook/generic

29 doc/cookbook/generic

25 -- doc/cookbook/hoist-server-with-context

30 -- doc/cookbook/hoist-server-with-context

26− doc/cookbook/https

31+-- doc/cookbook/https

27 -- doc/cookbook/jwt-and-basic-auth/

32 -- doc/cookbook/jwt-and-basic-auth/

28 doc/cookbook/pagination

33 doc/cookbook/pagination

29 -- doc/cookbook/sentry

34 -- doc/cookbook/sentry

@@ -44,26 +49,16 @@ constraints:

44 foundation >=0.0.14,

49 foundation >=0.0.14,

45 memory <0.14.12 || >0.14.12

50 memory <0.14.12 || >0.14.12

47−allow-newer:

52+allow-newer: aeson-pretty-0.8.7:base-compat

48−-- servant-pagination:servant, servant-pagination:servant-server,

49−-- servant-multipart:servant, servant-multipart:servant-server,

50−-- servant-auth-server:servant, servant-auth-server:servant-server,

51−-- servant-js:servant, servant-js:servant-foreign

52−

53−-- servant-quickcheck

54−allow-newer:

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

56− servant-quickcheck:hspec,

57− servant-quickcheck:http-client

58−

59−-- constraints: semigroups ^>=0.19

60−-- constraints: hashable ^>=1.3

61−-- constraints: network ^>=3.1

62−-- constraints: machines ^>=0.7

64allow-newer: vault-0.3.1.2:hashable

54allow-newer: vault-0.3.1.2:hashable

65allow-newer: psqueues-0.2.7.1:hashable

55allow-newer: psqueues-0.2.7.1:hashable

66allow-newer: sqlite-simple-0.4.16.0:semigroups

56allow-newer: sqlite-simple-0.4.16.0:semigroups

67allow-newer: direct-sqlite-2.3.24:semigroups

57allow-newer: direct-sqlite-2.3.24:semigroups

68allow-newer: io-streams-1.5.1.0:network

58allow-newer: io-streams-1.5.1.0:network

59+allow-newer: io-streams-1.5.1.0:primitive

69allow-newer: openssl-streams-1.2.2.0:network

60allow-newer: openssl-streams-1.2.2.0:network

61+

62+-- MonadFail

63+-- https://github.com/nurpax/sqlite-simple/issues/74

64+constraints: sqlite-simple < 0

doc/cookbook/basic-auth/basic-auth.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-basic-auth

14 main-is: BasicAuth.lhs

doc/cookbook/basic-streaming/basic-streaming.cabal+2−2

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-basic-streaming

14 main-is: Streaming.lhs

@@ -17,7 +17,7 @@ executable cookbook-basic-streaming

17 ghc-options: -Wall -pgmL markdown-unlit -threaded -rtsopts

19 hs-source-dirs: .

20− build-depends: base >= 4.8 && <4.13

20+ build-depends: base >= 4.8 && <5

21 , aeson

22 , bytestring

23 , servant

doc/cookbook/curl-mock/curl-mock.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbock-curl-mock

14 main-is: CurlMock.lhs

doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-db-postgres-pool

14 main-is: PostgresPool.lhs

doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-db-sqlite-simple

14 main-is: DBConnection.lhs

doc/cookbook/file-upload/file-upload.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-file-upload

14 main-is: FileUpload.lhs

doc/cookbook/generic/generic.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-using-custom-monad

14 main-is: Generic.lhs

doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+1−1

@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

11category: Servant

12build-type: Simple

13cabal-version: >=1.10

14−tested-with: GHC==8.4.4, GHC==8.6.5

14+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

16executable cookbook-hoist-server-with-context

17 main-is: HoistServerWithContext.lhs

doc/cookbook/https/https.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-https

14 main-is: Https.lhs

doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1

@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

11category: Servant

12build-type: Simple

13cabal-version: >=1.10

14−tested-with: GHC==8.4.4, GHC==8.6.5

14+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

16executable cookbook-jwt-and-basic-auth

17 main-is: JWTAndBasicAuth.lhs

doc/cookbook/pagination/pagination.cabal+2−2

@@ -8,14 +8,14 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-pagination

14 main-is: Pagination.lhs

15 build-tool-depends: markdown-unlit:markdown-unlit

16 default-language: Haskell2010

17 ghc-options: -Wall -pgmL markdown-unlit

18− build-depends: base >= 4.8 && <4.13

18+ build-depends: base >= 4.9 && <5

19 , aeson

20 , servant

21 , servant-server

doc/cookbook/sentry/sentry.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-sentry

14 main-is: Sentry.lhs

doc/cookbook/structuring-apis/structuring-apis.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-structuring-apis

14 main-is: StructuringApis.lhs

doc/cookbook/testing/testing.cabal+1−1

@@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

10category: Servant

11build-type: Simple

12cabal-version: >=1.10

13−tested-with: GHC==8.4.4, GHC==8.6.5

13+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

15executable cookbook-testing

16 main-is: Testing.lhs

doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-using-custom-monad

14 main-is: UsingCustomMonad.lhs

doc/cookbook/using-free-client/using-free-client.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-using-free-client

14 main-is: UsingFreeClient.lhs

doc/tutorial/tutorial.cabal+3−2

@@ -17,6 +17,7 @@ tested-with:

17 GHC==8.2.2

18 GHC==8.4.4

19 GHC==8.6.5

20+ GHC==8.8.1

20extra-source-files:

21extra-source-files:

21 static/index.html

22 static/index.html

22 static/ui.js

23 static/ui.js

@@ -34,7 +35,7 @@ library

34 -- Packages `servant` depends on.

35 -- Packages `servant` depends on.

35 -- We don't need to specify bounds here as this package is never released.

36 -- We don't need to specify bounds here as this package is never released.

36 build-depends:

37 build-depends:

37− base >= 4.7 && <4.13

38+ base >= 4.7 && <5

38 , aeson

39 , aeson

39 , attoparsec

40 , attoparsec

40 , base-compat

41 , base-compat

@@ -69,7 +70,7 @@ library

69 , lucid >= 2.9.11 && < 2.10

70 , lucid >= 2.9.11 && < 2.10

70 , random >= 1.1 && < 1.2

71 , random >= 1.1 && < 1.2

71 , servant-js >= 0.9 && < 0.10

72 , servant-js >= 0.9 && < 0.10

72− , time >= 1.6.0.1 && < 1.9

73+ , time >= 1.6.0.1 && < 1.10

74 -- For legacy tools, we need to specify build-depends too

75 -- For legacy tools, we need to specify build-depends too

75 build-depends: markdown-unlit >= 0.5.0 && <0.6

76 build-depends: markdown-unlit >= 0.5.0 && <0.6

servant-client-core/servant-client-core.cabal+4−3

@@ -21,6 +21,7 @@ tested-with:

21 || ==8.2.2

22 || ==8.4.4

23 || ==8.6.5

24+ || ==8.8.1

24 , GHCJS == 8.4

25 , GHCJS == 8.4

26extra-source-files:

27extra-source-files:

@@ -54,13 +55,13 @@ library

54 --

55 --

55 -- note: mtl lower bound is so low because of GHC-7.8

56 -- note: mtl lower bound is so low because of GHC-7.8

56 build-depends:

57 build-depends:

57− base >= 4.9 && < 4.13

58+ base >= 4.9 && < 4.14

58 , bytestring >= 0.10.8.1 && < 0.11

59 , bytestring >= 0.10.8.1 && < 0.11

59 , containers >= 0.5.7.1 && < 0.7

60 , containers >= 0.5.7.1 && < 0.7

60 , deepseq >= 1.4.2.0 && < 1.5

61 , deepseq >= 1.4.2.0 && < 1.5

61 , text >= 1.2.3.0 && < 1.3

62 , text >= 1.2.3.0 && < 1.3

62 , transformers >= 0.5.2.0 && < 0.6

63 , transformers >= 0.5.2.0 && < 0.6

63− , template-haskell >= 2.11.1.0 && < 2.15

64+ , template-haskell >= 2.11.1.0 && < 2.16

65 if !impl(ghc >= 8.2)

66 if !impl(ghc >= 8.2)

66 build-depends:

67 build-depends:

@@ -74,7 +75,7 @@ library

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

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

75 build-depends:

76 build-depends:

76 aeson >= 1.4.1.0 && < 1.5

77 aeson >= 1.4.1.0 && < 1.5

77− , base-compat >= 0.10.5 && < 0.11

78+ , base-compat >= 0.10.5 && < 0.12

78 , base64-bytestring >= 1.0.0.1 && < 1.1

79 , base64-bytestring >= 1.0.0.1 && < 1.1

79 , exceptions >= 0.10.0 && < 0.11

80 , exceptions >= 0.10.0 && < 0.11

80 , free >= 5.1 && < 5.2

81 , free >= 5.1 && < 5.2

servant-client/servant-client.cabal+4−3

@@ -25,6 +25,7 @@ tested-with:

25 || ==8.2.2

26 || ==8.4.4

27 || ==8.6.5

28+ || ==8.8.1

29extra-source-files:

30extra-source-files:

30 CHANGELOG.md

31 CHANGELOG.md

@@ -44,14 +45,14 @@ library

44 -- Bundled with GHC: Lower bound to not force re-installs

45 -- Bundled with GHC: Lower bound to not force re-installs

45 -- text and mtl are bundled starting with GHC-8.4

46 -- text and mtl are bundled starting with GHC-8.4

46 build-depends:

47 build-depends:

47− base >= 4.9 && < 4.13

48+ base >= 4.9 && < 4.14

48 , bytestring >= 0.10.8.1 && < 0.11

49 , bytestring >= 0.10.8.1 && < 0.11

49 , containers >= 0.5.7.1 && < 0.7

50 , containers >= 0.5.7.1 && < 0.7

50 , deepseq >= 1.4.2.0 && < 1.5

51 , deepseq >= 1.4.2.0 && < 1.5

51 , mtl >= 2.2.2 && < 2.3

52 , mtl >= 2.2.2 && < 2.3

52 , stm >= 2.4.5.1 && < 2.6

53 , stm >= 2.4.5.1 && < 2.6

53 , text >= 1.2.3.0 && < 1.3

54 , text >= 1.2.3.0 && < 1.3

54− , time >= 1.6.0.1 && < 1.9

55+ , time >= 1.6.0.1 && < 1.10

55 , transformers >= 0.5.2.0 && < 0.6

56 , transformers >= 0.5.2.0 && < 0.6

57 if !impl(ghc >= 8.2)

58 if !impl(ghc >= 8.2)

@@ -67,7 +68,7 @@ library

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

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

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

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

69 build-depends:

70 build-depends:

70− base-compat >= 0.10.5 && < 0.11

71+ base-compat >= 0.10.5 && < 0.12

71 , http-client >= 0.5.13.1 && < 0.7

72 , http-client >= 0.5.13.1 && < 0.7

72 , http-media >= 0.7.1.3 && < 0.9

73 , http-media >= 0.7.1.3 && < 0.9

73 , http-types >= 0.12.2 && < 0.13

74 , http-types >= 0.12.2 && < 0.13

servant-conduit/servant-conduit.cabal+1

@@ -22,6 +22,7 @@ tested-with:

22 || ==8.2.2

23 || ==8.4.4

24 || ==8.6.5

25+ || ==8.8.1

26extra-source-files:

27extra-source-files:

27 CHANGELOG.md

28 CHANGELOG.md

servant-docs/CHANGELOG.md+5

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

1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-docs/CHANGELOG.md)

2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

4+0.11.4

5+------

7+- Drop dependency on `control-monad-omega` in favor of `Data.Universe.Helpers` from `universe-base`.

40.11.3

90.11.3

5------

10------

servant-docs/servant-docs.cabal+6−6

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

1cabal-version: >=1.10

2name: servant-docs

3−version: 0.11.3

3+version: 0.11.4

4−x-revision: 1

6synopsis: generate API docs for your servant webservice

5synopsis: generate API docs for your servant webservice

7category: Servant, Web

6category: Servant, Web

@@ -25,6 +24,7 @@ tested-with:

25 || ==8.2.2

24 || ==8.2.2

26 || ==8.4.4

25 || ==8.4.4

27 || ==8.6.5

26 || ==8.6.5

27+ || ==8.8.1

29extra-source-files:

30 CHANGELOG.md

@@ -46,7 +46,7 @@ library

46 --

47 -- note: mtl lower bound is so low because of GHC-7.8

48 build-depends:

49− base >= 4.9 && < 4.13

49+ base >= 4.9 && < 4.14

50 , bytestring >= 0.10.8.1 && < 0.11

51 , text >= 1.2.3.0 && < 1.3

@@ -59,14 +59,14 @@ library

59 build-depends:

60 aeson >= 1.4.1.0 && < 1.5

61 , aeson-pretty >= 0.8.5 && < 0.9

62− , base-compat >= 0.10.5 && < 0.11

62+ , base-compat >= 0.10.5 && < 0.12

63 , case-insensitive >= 1.2.0.11 && < 1.3

64− , control-monad-omega >= 0.3.1 && < 0.4

65 , hashable >= 1.2.7.0 && < 1.4

64 , hashable >= 1.2.7.0 && < 1.4

66 , http-media >= 0.7.1.3 && < 0.9

65 , http-media >= 0.7.1.3 && < 0.9

67 , http-types >= 0.12.2 && < 0.13

66 , http-types >= 0.12.2 && < 0.13

68− , lens >= 4.17 && < 4.18

67+ , lens >= 4.17 && < 4.19

69 , string-conversions >= 0.4.0.1 && < 0.5

68 , string-conversions >= 0.4.0.1 && < 0.5

69+ , universe-base >= 1.1.1 && < 1.2

70 , unordered-containers >= 0.2.9.0 && < 0.3

72 hs-source-dirs: src

servant-docs/src/Servant/Docs/Internal.hs+9−8

@@ -27,7 +27,6 @@ import Control.Arrow

27import Control.Lens

28 (makeLenses, mapped, over, traversed, view, (%~), (&), (.~),

29 (<>~), (^.), (|>))

30−import qualified Control.Monad.Omega as Omega

31import qualified Data.ByteString.Char8 as BSC

30import qualified Data.ByteString.Char8 as BSC

32import Data.ByteString.Lazy.Char8

31import Data.ByteString.Lazy.Char8

33 (ByteString)

32 (ByteString)

@@ -65,6 +64,8 @@ import Servant.API

65import Servant.API.ContentTypes

64import Servant.API.ContentTypes

66import Servant.API.TypeLevel

65import Servant.API.TypeLevel

67+import qualified Data.Universe.Helpers as U

68+

68import qualified Data.HashMap.Strict as HM

69import qualified Data.HashMap.Strict as HM

69import qualified Data.Text as T

70import qualified Data.Text as T

70import qualified Network.HTTP.Media as M

71import qualified Network.HTTP.Media as M

@@ -479,22 +480,22 @@ samples = map ("",)

479

480

480-- | Default sample Generic-based inputs/outputs.

481-- | Default sample Generic-based inputs/outputs.

481defaultSamples :: forall a. (Generic a, GToSample (Rep a)) => Proxy a -> [(Text, a)]

482defaultSamples :: forall a. (Generic a, GToSample (Rep a)) => Proxy a -> [(Text, a)]

482−defaultSamples _ = Omega.runOmega $ second to <$> gtoSamples (Proxy :: Proxy (Rep a))

483+defaultSamples _ = second to <$> gtoSamples (Proxy :: Proxy (Rep a))

483

484

484-- | @'ToSample'@ for Generics.

485-- | @'ToSample'@ for Generics.

485--

486--

486−-- The use of @'Omega'@ allows for more productive sample generation.

487+-- Note: we use combinators from "Universe.Data.Helpers" for more productive sample generation.

487class GToSample t where

488class GToSample t where

488− gtoSamples :: proxy t -> Omega.Omega (Text, t x)

489+ gtoSamples :: proxy t -> [(Text, t x)]

489

490

490instance GToSample U1 where

491instance GToSample U1 where

491− gtoSamples _ = Omega.each (singleSample U1)

492+ gtoSamples _ = singleSample U1

492

493

493instance GToSample V1 where

494instance GToSample V1 where

494 gtoSamples _ = empty

495 gtoSamples _ = empty

495

496

496instance (GToSample p, GToSample q) => GToSample (p :*: q) where

497instance (GToSample p, GToSample q) => GToSample (p :*: q) where

497− gtoSamples _ = render <$> ps <*> qs

498+ gtoSamples _ = U.cartesianProduct render ps qs

498 where

499 where

499 ps = gtoSamples (Proxy :: Proxy p)

500 ps = gtoSamples (Proxy :: Proxy p)

500 qs = gtoSamples (Proxy :: Proxy q)

501 qs = gtoSamples (Proxy :: Proxy q)

@@ -503,13 +504,13 @@ instance (GToSample p, GToSample q) => GToSample (p :*: q) where

503 | otherwise = (ta <> ", " <> tb, a :*: b)

504 | otherwise = (ta <> ", " <> tb, a :*: b)

504

505

505instance (GToSample p, GToSample q) => GToSample (p :+: q) where

506instance (GToSample p, GToSample q) => GToSample (p :+: q) where

506− gtoSamples _ = lefts <|> rights

507+ gtoSamples _ = lefts U.+++ rights

507 where

508 where

508 lefts = second L1 <$> gtoSamples (Proxy :: Proxy p)

509 lefts = second L1 <$> gtoSamples (Proxy :: Proxy p)

509 rights = second R1 <$> gtoSamples (Proxy :: Proxy q)

510 rights = second R1 <$> gtoSamples (Proxy :: Proxy q)

510

511

511instance ToSample a => GToSample (K1 i a) where

512instance ToSample a => GToSample (K1 i a) where

512− gtoSamples _ = second K1 <$> Omega.each (toSamples (Proxy :: Proxy a))

513+ gtoSamples _ = second K1 <$> toSamples (Proxy :: Proxy a)

513

514

514instance (GToSample f) => GToSample (M1 i a f) where

515instance (GToSample f) => GToSample (M1 i a f) where

515 gtoSamples _ = second M1 <$> gtoSamples (Proxy :: Proxy f)

516 gtoSamples _ = second M1 <$> gtoSamples (Proxy :: Proxy f)

servant-foreign/servant-foreign.cabal+4−3

@@ -27,6 +27,7 @@ tested-with:

27 || ==8.2.2

28 || ==8.4.4

29 || ==8.6.5

30+ || ==8.8.1

31extra-source-files:

32extra-source-files:

32 CHANGELOG.md

33 CHANGELOG.md

@@ -46,7 +47,7 @@ library

46 --

47 --

47 -- note: mtl lower bound is so low because of GHC-7.8

48 -- note: mtl lower bound is so low because of GHC-7.8

48 build-depends:

49 build-depends:

49− base >= 4.9 && < 4.13

50+ base >= 4.9 && < 4.14

50 , text >= 1.2.3.0 && < 1.3

51 , text >= 1.2.3.0 && < 1.3

52 -- Servant dependencies

53 -- Servant dependencies

@@ -56,8 +57,8 @@ library

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

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

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

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

58 build-depends:

59 build-depends:

59− base-compat >= 0.10.5 && < 0.11

60+ base-compat >= 0.10.5 && < 0.12

60− , lens >= 4.17 && < 4.18

61+ , lens >= 4.17 && < 4.19

61 , http-types >= 0.12.2 && < 0.13

62 , http-types >= 0.12.2 && < 0.13

63 hs-source-dirs: src

64 hs-source-dirs: src

servant-http-streams/servant-http-streams.cabal+4−3

@@ -25,6 +25,7 @@ tested-with:

25 || ==8.2.2

26 || ==8.4.4

27 || ==8.6.5

28+ || ==8.8.1

29extra-source-files:

30extra-source-files:

30 CHANGELOG.md

31 CHANGELOG.md

@@ -42,13 +43,13 @@ library

42 -- Bundled with GHC: Lower bound to not force re-installs

43 -- Bundled with GHC: Lower bound to not force re-installs

43 -- text and mtl are bundled starting with GHC-8.4

44 -- text and mtl are bundled starting with GHC-8.4

44 build-depends:

45 build-depends:

45− base >= 4.9 && < 4.13

46+ base >= 4.9 && < 4.14

46 , bytestring >= 0.10.8.1 && < 0.11

47 , bytestring >= 0.10.8.1 && < 0.11

47 , containers >= 0.5.7.1 && < 0.7

48 , containers >= 0.5.7.1 && < 0.7

48 , deepseq >= 1.4.2.0 && < 1.5

49 , deepseq >= 1.4.2.0 && < 1.5

49 , mtl >= 2.2.2 && < 2.3

50 , mtl >= 2.2.2 && < 2.3

50 , text >= 1.2.3.0 && < 1.3

51 , text >= 1.2.3.0 && < 1.3

51− , time >= 1.6.0.1 && < 1.9

52+ , time >= 1.6.0.1 && < 1.10

52 , transformers >= 0.5.2.0 && < 0.6

53 , transformers >= 0.5.2.0 && < 0.6

54 if !impl(ghc >= 8.2)

55 if !impl(ghc >= 8.2)

@@ -64,7 +65,7 @@ library

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

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

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

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

66 build-depends:

67 build-depends:

67− base-compat >= 0.10.5 && < 0.11

68+ base-compat >= 0.10.5 && < 0.12

68 , case-insensitive

69 , case-insensitive

69 , http-streams >= 0.8.6.1 && < 0.9

70 , http-streams >= 0.8.6.1 && < 0.9

70 , http-media >= 0.7.1.3 && < 0.9

71 , http-media >= 0.7.1.3 && < 0.9

servant-machines/servant-machines.cabal+1

@@ -22,6 +22,7 @@ tested-with:

22 || ==8.2.2

23 || ==8.4.4

24 || ==8.6.5

25+ || ==8.8.1

26extra-source-files:

27extra-source-files:

27 CHANGELOG.md

28 CHANGELOG.md

servant-pipes/servant-pipes.cabal+1

@@ -21,6 +21,7 @@ tested-with:

21 || ==8.2.2

22 || ==8.4.4

23 || ==8.6.5

24+ || ==8.8.1

25extra-source-files:

26extra-source-files:

26 CHANGELOG.md

27 CHANGELOG.md

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

@@ -28,6 +28,7 @@ tested-with:

28 || ==8.2.2

29 || ==8.4.4

30 || ==8.6.5

31+ || ==8.8.1

32extra-source-files:

33extra-source-files:

33 CHANGELOG.md

34 CHANGELOG.md

@@ -68,7 +69,7 @@ library

68 -- Bundled with GHC: Lower bound to not force re-installs

69 -- Bundled with GHC: Lower bound to not force re-installs

69 -- text and mtl are bundled starting with GHC-8.4

70 -- text and mtl are bundled starting with GHC-8.4

70 build-depends:

71 build-depends:

71− base >= 4.9 && < 4.13

72+ base >= 4.9 && < 4.14

72 , bytestring >= 0.10.8.1 && < 0.11

73 , bytestring >= 0.10.8.1 && < 0.11

73 , containers >= 0.5.7.1 && < 0.7

74 , containers >= 0.5.7.1 && < 0.7

74 , mtl >= 2.2.2 && < 2.3

75 , mtl >= 2.2.2 && < 2.3

@@ -85,7 +86,7 @@ library

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

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

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

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

87 build-depends:

88 build-depends:

88− base-compat >= 0.10.5 && < 0.11

89+ base-compat >= 0.10.5 && < 0.12

89 , base64-bytestring >= 1.0.0.1 && < 1.1

90 , base64-bytestring >= 1.0.0.1 && < 1.1

90 , exceptions >= 0.10.0 && < 0.11

91 , exceptions >= 0.10.0 && < 0.11

91 , http-media >= 0.7.1.3 && < 0.9

92 , http-media >= 0.7.1.3 && < 0.9

servant/servant.cabal+3−2

@@ -25,6 +25,7 @@ tested-with:

25 || ==8.2.2

26 || ==8.4.4

27 || ==8.6.5

28+ || ==8.8.1

28 , GHCJS == 8.4

29 , GHCJS == 8.4

30extra-source-files:

31extra-source-files:

@@ -89,7 +90,7 @@ library

89 --

90 --

90 -- note: mtl lower bound is so low because of GHC-7.8

91 -- note: mtl lower bound is so low because of GHC-7.8

91 build-depends:

92 build-depends:

92− base >= 4.9 && < 4.13

93+ base >= 4.9 && < 4.14

93 , bytestring >= 0.10.8.1 && < 0.11

94 , bytestring >= 0.10.8.1 && < 0.11

94 , mtl >= 2.2.2 && < 2.3

95 , mtl >= 2.2.2 && < 2.3

95 , transformers >= 0.5.2.0 && < 0.6

96 , transformers >= 0.5.2.0 && < 0.6

@@ -105,7 +106,7 @@ library

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

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

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

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

107 build-depends:

108 build-depends:

108− base-compat >= 0.10.5 && < 0.11

109+ base-compat >= 0.10.5 && < 0.12

109 , aeson >= 1.4.1.0 && < 1.5

110 , aeson >= 1.4.1.0 && < 1.5

110 , attoparsec >= 0.13.2.2 && < 0.14

111 , attoparsec >= 0.13.2.2 && < 0.14

111 , bifunctors >= 5.5.3 && < 5.6

112 , bifunctors >= 5.5.3 && < 5.6