git.iko.soy/servant
on master help sign in
Relax bounds for ghc-8.8
f089f8dOleg Grenrus
.travis.yml+39−45
compare with master
unifiedsplit
@@ -4,7 +4,7 @@
4#
4#
5# For more information, see https://github.com/haskell-CI/haskell-ci
5# For more information, see https://github.com/haskell-CI/haskell-ci
6#
6#
7−# version: 0.5.20190908
7+# version: 0.5.20190916
8#
8#
9language: c
9language: c
10dist: xenial
10dist: xenial
@@ -33,6 +33,8 @@ matrix:
33 include:
33 include:
34 - compiler: ghcjs-8.4
34 - compiler: ghcjs-8.4
35 addons: {"apt":{"sources":["hvr-ghc"],"packages":["cabal-install-3.0"]}}
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
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
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
155 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/structuring-apis" >> cabal.project ; fi
@@ -158,36 +158,21 @@ install:
158 - |
158 - |
159 echo "constraints: foundation >=0.0.14" >> cabal.project
159 echo "constraints: foundation >=0.0.14" >> cabal.project
160 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
160 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
161−<<<<<<< HEAD
162− echo "allow-newer: servant-quickcheck:servant" >> cabal.project
163− echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
164− echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
165− echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
166− echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
167−=======
168 echo "constraints: sqlite-simple < 0" >> cabal.project
161 echo "constraints: sqlite-simple < 0" >> cabal.project
169 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
162 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
170−>>>>>>> 8ed0e9e2... Less allow-newer
171 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
163 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
172 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
164 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
173 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
174 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
166 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
175 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
176−<<<<<<< HEAD
177− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
178− echo "optimization: False" >> cabal.project
179− - "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"
180−=======
181 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
168 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
182 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
183 echo "optimization: False" >> cabal.project
170 echo "optimization: False" >> cabal.project
184− - "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-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"
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"
185−>>>>>>> 8ed0e9e2... Less allow-newer
186 - cat cabal.project || true
172 - cat cabal.project || true
187 - cat cabal.project.local || true
173 - cat cabal.project.local || true
188 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
174 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
189 - 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
190− - if [ -f "servant-jsaddle/configure.ac" ]; then (cd "servant-jsaddle" && autoreconf -i); fi
191 - 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
192 - 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
193 - 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
@@ -197,14 +182,13 @@ install:
197 - 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
198 - 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
199 - 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
200 - 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
201 - 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
202 - 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
203 - 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
204− - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i); fi
205 - 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
206 - 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
207− - if [ -f "doc/cookbook/https/configure.ac" ]; then (cd "doc/cookbook/https" && autoreconf -i); fi
208 - 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
209 - 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
210 - 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
@@ -227,7 +211,6 @@ script:
227 - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
211 - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
228 - PKGDIR_servant="$(find . -maxdepth 1 -type d -regex '.*/servant-[0-9.]*')"
212 - PKGDIR_servant="$(find . -maxdepth 1 -type d -regex '.*/servant-[0-9.]*')"
229 - 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.]*')"
230− - PKGDIR_servant_jsaddle="$(find . -maxdepth 1 -type d -regex '.*/servant-jsaddle-[0-9.]*')"
231 - 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.]*')"
232 - 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.]*')"
233 - 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.]*')"
@@ -237,14 +220,13 @@ script:
237 - 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.]*')"
238 - 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.]*')"
239 - 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.]*')"
240 - 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.]*')"
241 - 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.]*')"
242 - 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.]*')"
243 - 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.]*')"
244− - PKGDIR_cookbook_db_sqlite_simple="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-sqlite-simple-[0-9.]*')"
245 - 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.]*')"
246 - 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.]*')"
247− - PKGDIR_cookbook_https="$(find . -maxdepth 1 -type d -regex '.*/cookbook-https-[0-9.]*')"
248 - 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.]*')"
249 - 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.]*')"
250 - 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.]*')"
@@ -256,7 +238,6 @@ script:
256 - |
238 - |
257 echo "packages: ${PKGDIR_servant}" >> cabal.project
239 echo "packages: ${PKGDIR_servant}" >> cabal.project
258 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_client}" >> cabal.project ; fi
240 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_client}" >> cabal.project ; fi
259− echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project
260 echo "packages: ${PKGDIR_servant_client_core}" >> cabal.project
241 echo "packages: ${PKGDIR_servant_client_core}" >> cabal.project
261 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
262 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_docs}" >> cabal.project ; fi
243 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_docs}" >> cabal.project ; fi
@@ -266,14 +247,13 @@ script:
266 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi
247 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi
267 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi
248 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi
268 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
269 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
270 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
271 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
272 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
273− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_sqlite_simple}" >> cabal.project ; fi
274 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
275 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
276− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_https}" >> cabal.project ; fi
277 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
278 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
279 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
@@ -282,33 +262,47 @@ script:
282 - |
262 - |
283 echo "constraints: foundation >=0.0.14" >> cabal.project
263 echo "constraints: foundation >=0.0.14" >> cabal.project
284 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
264 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
285−<<<<<<< HEAD
286− echo "allow-newer: servant-quickcheck:servant" >> cabal.project
287− echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
288− echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
289− echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
290− echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
291−=======
292 echo "constraints: sqlite-simple < 0" >> cabal.project
265 echo "constraints: sqlite-simple < 0" >> cabal.project
293 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
266 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
294−>>>>>>> 8ed0e9e2... Less allow-newer
295 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
267 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
296 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
268 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
297 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
298 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
270 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
299 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
300−<<<<<<< HEAD
301− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
302− echo "optimization: False" >> cabal.project
303− - "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"
304−=======
305 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
272 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
306 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
307 echo "optimization: False" >> cabal.project
274 echo "optimization: False" >> cabal.project
308− - "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-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"
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"
309−>>>>>>> 8ed0e9e2... Less allow-newer
310 - cat cabal.project || true
276 - cat cabal.project || true
311 - 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+ }
312 - echo -en 'travis_fold:end:unpack\\r'
306 - echo -en 'travis_fold:end:unpack\\r'
313 # Building with tests and benchmarks...
307 # Building with tests and benchmarks...
314 - 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'
@@ -317,7 +311,7 @@ script:
317 - echo -en 'travis_fold:end:build-everything\\r'
311 - echo -en 'travis_fold:end:build-everything\\r'
318 # Testing...
312 # Testing...
319 - 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
320− - 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
321 # haddock...
315 # haddock...
322 - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'
316 - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'
323 - 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+1−1
@@ -16,7 +16,7 @@ packages:
16
16
17-- servant GHCJS
17-- servant GHCJS
18packages:
18packages:
19−-- servant-jsaddle/
19+ servant-jsaddle/
20
20
21-- Cookbooks
21-- Cookbooks
22packages:
22packages:
doc/cookbook/basic-auth/basic-auth.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-basic-auth
13executable cookbook-basic-auth
14 main-is: BasicAuth.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-basic-streaming
13executable cookbook-basic-streaming
14 main-is: Streaming.lhs
14 main-is: Streaming.lhs
@@ -17,7 +17,7 @@ executable cookbook-basic-streaming
17 ghc-options: -Wall -pgmL markdown-unlit -threaded -rtsopts
17 ghc-options: -Wall -pgmL markdown-unlit -threaded -rtsopts
18
18
19 hs-source-dirs: .
19 hs-source-dirs: .
20− build-depends: base >= 4.8 && <4.13
20+ build-depends: base >= 4.8 && <5
21 , aeson
21 , aeson
22 , bytestring
22 , bytestring
23 , servant
23 , servant
doc/cookbook/curl-mock/curl-mock.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbock-curl-mock
13executable cookbock-curl-mock
14 main-is: CurlMock.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-db-postgres-pool
13executable cookbook-db-postgres-pool
14 main-is: PostgresPool.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-db-sqlite-simple
13executable cookbook-db-sqlite-simple
14 main-is: DBConnection.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-file-upload
13executable cookbook-file-upload
14 main-is: FileUpload.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-using-custom-monad
13executable cookbook-using-custom-monad
14 main-is: Generic.lhs
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
11category: Servant
12build-type: Simple
12build-type: Simple
13cabal-version: >=1.10
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
15
15
16executable cookbook-hoist-server-with-context
16executable cookbook-hoist-server-with-context
17 main-is: HoistServerWithContext.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-https
13executable cookbook-https
14 main-is: Https.lhs
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
11category: Servant
12build-type: Simple
12build-type: Simple
13cabal-version: >=1.10
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
15
15
16executable cookbook-jwt-and-basic-auth
16executable cookbook-jwt-and-basic-auth
17 main-is: JWTAndBasicAuth.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-pagination
13executable cookbook-pagination
14 main-is: Pagination.lhs
14 main-is: Pagination.lhs
15 build-tool-depends: markdown-unlit:markdown-unlit
15 build-tool-depends: markdown-unlit:markdown-unlit
16 default-language: Haskell2010
16 default-language: Haskell2010
17 ghc-options: -Wall -pgmL markdown-unlit
17 ghc-options: -Wall -pgmL markdown-unlit
18− build-depends: base >= 4.8 && <4.13
18+ build-depends: base >= 4.9 && <5
19 , aeson
19 , aeson
20 , servant
20 , servant
21 , servant-server
21 , servant-server
doc/cookbook/sentry/sentry.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-sentry
13executable cookbook-sentry
14 main-is: Sentry.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-structuring-apis
13executable cookbook-structuring-apis
14 main-is: StructuringApis.lhs
14 main-is: StructuringApis.lhs
doc/cookbook/testing/testing.cabal+1−1
@@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
10category: Servant
10category: Servant
11build-type: Simple
11build-type: Simple
12cabal-version: >=1.10
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
14
14
15executable cookbook-testing
15executable cookbook-testing
16 main-is: Testing.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-using-custom-monad
13executable cookbook-using-custom-monad
14 main-is: UsingCustomMonad.lhs
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
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
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
12
12
13executable cookbook-using-free-client
13executable cookbook-using-free-client
14 main-is: UsingFreeClient.lhs
14 main-is: UsingFreeClient.lhs
doc/tutorial/tutorial.cabal+3−2
@@ -17,6 +17,7 @@ tested-with:
17 GHC==8.2.2
17 GHC==8.2.2
18 GHC==8.4.4
18 GHC==8.4.4
19 GHC==8.6.5
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
73
74
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
21 || ==8.2.2
22 || ==8.4.4
22 || ==8.4.4
23 || ==8.6.5
23 || ==8.6.5
24+ || ==8.8.1
24 , GHCJS == 8.4
25 , GHCJS == 8.4
25
26
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
64
65
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
25 || ==8.2.2
26 || ==8.4.4
26 || ==8.4.4
27 || ==8.6.5
27 || ==8.6.5
28+ || ==8.8.1
28
29
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
56
57
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
22 || ==8.2.2
23 || ==8.4.4
23 || ==8.4.4
24 || ==8.6.5
24 || ==8.6.5
25+ || ==8.8.1
25
26
26extra-source-files:
27extra-source-files:
27 CHANGELOG.md
28 CHANGELOG.md
servant-docs/servant-docs.cabal+4−3
@@ -24,6 +24,7 @@ tested-with:
24 || ==8.2.2
24 || ==8.2.2
25 || ==8.4.4
25 || ==8.4.4
26 || ==8.6.5
26 || ==8.6.5
27+ || ==8.8.1
27
28
28extra-source-files:
29extra-source-files:
29 CHANGELOG.md
30 CHANGELOG.md
@@ -45,7 +46,7 @@ library
45 --
46 --
46 -- note: mtl lower bound is so low because of GHC-7.8
47 -- note: mtl lower bound is so low because of GHC-7.8
47 build-depends:
48 build-depends:
48− base >= 4.9 && < 4.13
49+ base >= 4.9 && < 4.14
49 , bytestring >= 0.10.8.1 && < 0.11
50 , bytestring >= 0.10.8.1 && < 0.11
50 , text >= 1.2.3.0 && < 1.3
51 , text >= 1.2.3.0 && < 1.3
51
52
@@ -58,12 +59,12 @@ library
58 build-depends:
59 build-depends:
59 aeson >= 1.4.1.0 && < 1.5
60 aeson >= 1.4.1.0 && < 1.5
60 , aeson-pretty >= 0.8.5 && < 0.9
61 , aeson-pretty >= 0.8.5 && < 0.9
61− , base-compat >= 0.10.5 && < 0.11
62+ , base-compat >= 0.10.5 && < 0.12
62 , case-insensitive >= 1.2.0.11 && < 1.3
63 , case-insensitive >= 1.2.0.11 && < 1.3
63 , hashable >= 1.2.7.0 && < 1.4
64 , hashable >= 1.2.7.0 && < 1.4
64 , http-media >= 0.7.1.3 && < 0.9
65 , http-media >= 0.7.1.3 && < 0.9
65 , http-types >= 0.12.2 && < 0.13
66 , http-types >= 0.12.2 && < 0.13
66− , lens >= 4.17 && < 4.18
67+ , lens >= 4.17 && < 4.19
67 , string-conversions >= 0.4.0.1 && < 0.5
68 , string-conversions >= 0.4.0.1 && < 0.5
68 , universe-base >= 1.1.1 && < 1.2
69 , universe-base >= 1.1.1 && < 1.2
69 , unordered-containers >= 0.2.9.0 && < 0.3
70 , unordered-containers >= 0.2.9.0 && < 0.3
servant-foreign/servant-foreign.cabal+4−3
@@ -27,6 +27,7 @@ tested-with:
27 || ==8.2.2
27 || ==8.2.2
28 || ==8.4.4
28 || ==8.4.4
29 || ==8.6.5
29 || ==8.6.5
30+ || ==8.8.1
30
31
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
51
52
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
62
63
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
25 || ==8.2.2
26 || ==8.4.4
26 || ==8.4.4
27 || ==8.6.5
27 || ==8.6.5
28+ || ==8.8.1
28
29
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
53
54
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
22 || ==8.2.2
23 || ==8.4.4
23 || ==8.4.4
24 || ==8.6.5
24 || ==8.6.5
25+ || ==8.8.1
25
26
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
21 || ==8.2.2
22 || ==8.4.4
22 || ==8.4.4
23 || ==8.6.5
23 || ==8.6.5
24+ || ==8.8.1
24
25
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
28 || ==8.2.2
29 || ==8.4.4
29 || ==8.4.4
30 || ==8.6.5
30 || ==8.6.5
31+ || ==8.8.1
31
32
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
25 || ==8.2.2
26 || ==8.4.4
26 || ==8.4.4
27 || ==8.6.5
27 || ==8.6.5
28+ || ==8.8.1
28 , GHCJS == 8.4
29 , GHCJS == 8.4
29
30
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