git.iko.soy/servant
on master help sign in
Merge pull request #1046 from phadej/fosskers/ghc-86-bounds

Fosskers/ghc 86 bounds

commit26b98f0e95403b789b36c6f5ec3d2c59f71751a2 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 14 Oct 2018, 11:41 (8 years ago) parent80c1ec145e7d58
23 files changed+55−56
compare with master
unifiedsplit
.travis.yml+14−23 cabal.project+5−4 doc/cookbook/basic-auth/basic-auth.cabal+1−1 doc/cookbook/curl-mock/curl-mock.cabal+1−1 doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1 doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1 doc/cookbook/file-upload/file-upload.cabal+1−1 doc/cookbook/generic/generic.cabal+1−1 doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+1−1 doc/cookbook/https/https.cabal+1−1 doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1 doc/cookbook/pagination/pagination.cabal+2−2 doc/cookbook/sentry/sentry.cabal+1−1 doc/cookbook/structuring-apis/structuring-apis.cabal+1−1 doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1 doc/cookbook/using-free-client/using-free-client.cabal+1−1 doc/tutorial/tutorial.cabal+2−1 servant-client-core/servant-client-core.cabal+4−3 servant-client/servant-client.cabal+5−4 servant-docs/servant-docs.cabal+2−1 servant-foreign/servant-foreign.cabal+2−1 servant-server/servant-server.cabal+4−3 servant/servant.cabal+2−1
.travis.yml+14−23
@@ -32,6 +32,9 @@ before_cache:
3232
3333matrix:
3434 include:
35+ - compiler: "ghc-8.6.1"
36+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
3538 - compiler: "ghc-8.4.3"
3639 # env: TEST=--disable-tests BENCH=--disable-benchmarks
3740 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
@@ -66,11 +69,11 @@ install:
6669 - rm -fv cabal.project cabal.project.local
6770 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
6871 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
69− - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/basic-auth\" \"doc/cookbook/curl-mock\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/generic\" \"doc/cookbook/https\" \"doc/cookbook/hoist-server-with-context\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/pagination\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/using-free-client\" \"doc/cookbook/sentry\"\\n' > cabal.project"
72+ - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/basic-auth\" \"doc/cookbook/curl-mock\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/generic\" \"doc/cookbook/https\" \"doc/cookbook/sentry\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/using-free-client\"\\n' > cabal.project"
7073 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
71− - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
74+ - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server,servant-js:base, servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
7275 - touch cabal.project.local
73− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-https | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-pagination | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | grep -vw -- cookbook-sentry | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
76+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-https | grep -vw -- cookbook-sentry | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
7477 - cat cabal.project || true
7578 - cat cabal.project.local || true
7679 - if [ -f "servant/configure.ac" ]; then
@@ -115,14 +118,8 @@ install:
115118 - if [ -f "doc/cookbook/https/configure.ac" ]; then
116119 (cd "doc/cookbook/https" && autoreconf -i);
117120 fi
118− - if [ -f "doc/cookbook/hoist-server-with-context/configure.ac" ]; then
119− (cd "doc/cookbook/hoist-server-with-context" && autoreconf -i);
120− fi
121− - if [ -f "doc/cookbook/jwt-and-basic-auth/configure.ac" ]; then
122− (cd "doc/cookbook/jwt-and-basic-auth" && autoreconf -i);
123− fi
124− - if [ -f "doc/cookbook/pagination/configure.ac" ]; then
125− (cd "doc/cookbook/pagination" && autoreconf -i);
121+ - if [ -f "doc/cookbook/sentry/configure.ac" ]; then
122+ (cd "doc/cookbook/sentry" && autoreconf -i);
126123 fi
127124 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then
128125 (cd "doc/cookbook/structuring-apis" && autoreconf -i);
@@ -133,11 +130,8 @@ install:
133130 - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then
134131 (cd "doc/cookbook/using-free-client" && autoreconf -i);
135132 fi
136− - if [ -f "doc/cookbook/sentry/configure.ac" ]; then
137− (cd "doc/cookbook/sentry" && autoreconf -i);
138− fi
139133 - rm -f cabal.project.freeze
140− - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/curl-mock"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/file-upload"/dist "doc/cookbook/generic"/dist "doc/cookbook/https"/dist "doc/cookbook/hoist-server-with-context"/dist "doc/cookbook/jwt-and-basic-auth"/dist "doc/cookbook/pagination"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist "doc/cookbook/sentry"/dist
134+ - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/curl-mock"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/file-upload"/dist "doc/cookbook/generic"/dist "doc/cookbook/https"/dist "doc/cookbook/sentry"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist
141135 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
142136
143137# Here starts the actual work to be performed for the package under test;
@@ -159,23 +153,20 @@ script:
159153 - (cd "doc/cookbook/file-upload" && cabal sdist)
160154 - (cd "doc/cookbook/generic" && cabal sdist)
161155 - (cd "doc/cookbook/https" && cabal sdist)
162− - (cd "doc/cookbook/hoist-server-with-context" && cabal sdist)
163− - (cd "doc/cookbook/jwt-and-basic-auth" && cabal sdist)
164− - (cd "doc/cookbook/pagination" && cabal sdist)
156+ - (cd "doc/cookbook/sentry" && cabal sdist)
165157 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
166158 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
167159 - (cd "doc/cookbook/using-free-client" && cabal sdist)
168− - (cd "doc/cookbook/sentry" && cabal sdist)
169160 - echo -en 'travis_fold:end:sdist\\r'
170161 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
171− - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/basic-auth"/dist/cookbook-basic-auth-*.tar.gz "doc/cookbook/curl-mock"/dist/cookbook-curl-mock-*.tar.gz "doc/cookbook/db-postgres-pool"/dist/cookbook-db-postgres-pool-*.tar.gz "doc/cookbook/db-sqlite-simple"/dist/cookbook-db-sqlite-simple-*.tar.gz "doc/cookbook/file-upload"/dist/cookbook-file-upload-*.tar.gz "doc/cookbook/generic"/dist/cookbook-generic-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/hoist-server-with-context"/dist/cookbook-hoist-server-with-context-*.tar.gz "doc/cookbook/jwt-and-basic-auth"/dist/cookbook-jwt-and-basic-auth-*.tar.gz "doc/cookbook/pagination"/dist/cookbook-pagination-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz "doc/cookbook/using-free-client"/dist/cookbook-using-free-client-*.tar.gz "doc/cookbook/sentry"/dist/cookbook-sentry-*.tar.gz ${DISTDIR}/
162+ - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/basic-auth"/dist/cookbook-basic-auth-*.tar.gz "doc/cookbook/curl-mock"/dist/cookbook-curl-mock-*.tar.gz "doc/cookbook/db-postgres-pool"/dist/cookbook-db-postgres-pool-*.tar.gz "doc/cookbook/db-sqlite-simple"/dist/cookbook-db-sqlite-simple-*.tar.gz "doc/cookbook/file-upload"/dist/cookbook-file-upload-*.tar.gz "doc/cookbook/generic"/dist/cookbook-generic-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/sentry"/dist/cookbook-sentry-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz "doc/cookbook/using-free-client"/dist/cookbook-using-free-client-*.tar.gz ${DISTDIR}/
172163 - cd ${DISTDIR} || false
173164 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
174− - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-curl-mock-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-https-*/*.cabal cookbook-hoist-server-with-context-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-pagination-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-using-free-client-*/*.cabal cookbook-sentry-*/*.cabal\\n' > cabal.project"
165+ - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-curl-mock-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-https-*/*.cabal cookbook-sentry-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-using-free-client-*/*.cabal\\n' > cabal.project"
175166 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
176− - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
167+ - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server,servant-js:base, servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
177168 - touch cabal.project.local
178− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-https | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-pagination | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | grep -vw -- cookbook-sentry | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
169+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-https | grep -vw -- cookbook-sentry | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
179170 - cat cabal.project || true
180171 - cat cabal.project.local || true
181172 - echo -en 'travis_fold:end:unpack\\r'
cabal.project+5−4
@@ -14,10 +14,10 @@ packages: servant/
1414 doc/cookbook/db-sqlite-simple
1515 doc/cookbook/file-upload
1616 doc/cookbook/generic
17− doc/cookbook/hoist-server-with-context
17+ -- doc/cookbook/hoist-server-with-context
1818 doc/cookbook/https
19− doc/cookbook/jwt-and-basic-auth/
20− doc/cookbook/pagination
19+ -- doc/cookbook/jwt-and-basic-auth/
20+ -- doc/cookbook/pagination
2121 doc/cookbook/sentry
2222 doc/cookbook/structuring-apis
2323 doc/cookbook/using-custom-monad
@@ -25,7 +25,8 @@ packages: servant/
2525
2626allow-newer:
2727 servant-auth-server:http-types,
28− servant-auth-server:servant-server
28+ servant-auth-server:servant-server,
29+ servant-js:base
2930
3031constraints:
3132 -- see https://github.com/haskell-infra/hackage-trustees/issues/119
doc/cookbook/basic-auth/basic-auth.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-basic-auth
1414 main-is: BasicAuth.lhs
doc/cookbook/curl-mock/curl-mock.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbock-curl-mock
1414 main-is: CurlMock.lhs
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-db-postgres-pool
1414 main-is: PostgresPool.lhs
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-db-sqlite-simple
1414 main-is: DBConnection.lhs
doc/cookbook/file-upload/file-upload.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-file-upload
1414 main-is: FileUpload.lhs
doc/cookbook/generic/generic.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-using-custom-monad
1414 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
1111category: Servant
1212build-type: Simple
1313cabal-version: >=1.10
14−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
14+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1515
1616executable cookbook-hoist-server-with-context
1717 main-is: HoistServerWithContext.lhs
doc/cookbook/https/https.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-https
1414 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
1111category: Servant
1212build-type: Simple
1313cabal-version: >=1.10
14−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
14+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1515
1616executable cookbook-jwt-and-basic-auth
1717 main-is: JWTAndBasicAuth.lhs
doc/cookbook/pagination/pagination.cabal+2−2
@@ -8,14 +8,14 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-pagination
1414 main-is: Pagination.lhs
1515 build-tool-depends: markdown-unlit:markdown-unlit
1616 default-language: Haskell2010
1717 ghc-options: -Wall -pgmL markdown-unlit
18− build-depends: base >= 4.8 && <4.12
18+ build-depends: base >= 4.8 && <4.13
1919 , aeson
2020 , servant
2121 , servant-server
doc/cookbook/sentry/sentry.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-sentry
1414 main-is: Sentry.lhs
doc/cookbook/structuring-apis/structuring-apis.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-structuring-apis
1414 main-is: StructuringApis.lhs
doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-using-custom-monad
1414 main-is: UsingCustomMonad.lhs
doc/cookbook/using-free-client/using-free-client.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
1212
1313executable cookbook-using-free-client
1414 main-is: UsingFreeClient.lhs
doc/tutorial/tutorial.cabal+2−1
@@ -16,6 +16,7 @@ tested-with:
1616 GHC==8.0.2
1717 GHC==8.2.2
1818 GHC==8.4.3
19+ GHC==8.6.1
1920extra-source-files:
2021 static/index.html
2122 static/ui.js
@@ -33,7 +34,7 @@ library
3334 -- Packages `servant` depends on.
3435 -- We don't need to specify bounds here as this package is never released.
3536 build-depends:
36− base >= 4.7 && <4.12
37+ base >= 4.7 && <4.13
3738 , aeson
3839 , aeson-compat
3940 , attoparsec
servant-client-core/servant-client-core.cabal+4−3
@@ -21,6 +21,7 @@ tested-with:
2121 GHC==8.0.2
2222 GHC==8.2.2
2323 GHC==8.4.3
24+ GHC==8.6.1
2425
2526source-repository head
2627 type: git
@@ -46,12 +47,12 @@ library
4647 --
4748 -- note: mtl lower bound is so low because of GHC-7.8
4849 build-depends:
49− base >= 4.9 && < 4.12
50+ base >= 4.9 && < 4.13
5051 , bytestring >= 0.10.8.1 && < 0.11
51− , containers >= 0.5.7.1 && < 0.6
52+ , containers >= 0.5.7.1 && < 0.7
5253 , text >= 1.2.3.0 && < 1.3
5354 , transformers >= 0.5.2.0 && < 0.6
54− , template-haskell >= 2.11.1.0 && < 2.14
55+ , template-haskell >= 2.11.1.0 && < 2.15
5556
5657 -- Servant dependencies
5758 build-depends:
servant-client/servant-client.cabal+5−4
@@ -20,6 +20,7 @@ tested-with:
2020 GHC==8.0.2
2121 GHC==8.2.2
2222 GHC==8.4.3
23+ GHC==8.6.1
2324homepage: http://haskell-servant.readthedocs.org/
2425Bug-reports: http://github.com/haskell-servant/servant/issues
2526extra-source-files:
@@ -39,9 +40,9 @@ library
3940 --
4041 -- note: mtl lower bound is so low because of GHC-7.8
4142 build-depends:
42− base >= 4.7 && < 4.12
43+ base >= 4.7 && < 4.13
4344 , bytestring >= 0.10.4.0 && < 0.11
44− , containers >= 0.5.5.1 && < 0.6
45+ , containers >= 0.5.5.1 && < 0.7
4546 , mtl >= 2.1 && < 2.3
4647 , text >= 1.2.3.0 && < 1.3
4748 , time >= 1.4.2 && < 1.9
@@ -60,8 +61,8 @@ library
6061 , http-types >= 0.12.1 && < 0.13
6162 , exceptions >= 0.10.0 && < 0.11
6263 , monad-control >= 1.0.2.3 && < 1.1
63− , semigroupoids >= 5.2.2 && < 5.3
64− , stm >= 2.4.5.0 && < 2.5
64+ , semigroupoids >= 5.2.2 && < 5.4
65+ , stm >= 2.4.5.0 && < 2.6
6566 , transformers-base >= 0.4.5.2 && < 0.5
6667 , transformers-compat >= 0.6.2 && < 0.7
6768
servant-docs/servant-docs.cabal+2−1
@@ -20,6 +20,7 @@ tested-with:
2020 GHC==8.0.2
2121 GHC==8.2.2
2222 GHC==8.4.3
23+ GHC==8.6.1
2324homepage: http://haskell-servant.readthedocs.org/
2425Bug-reports: http://github.com/haskell-servant/servant/issues
2526extra-source-files:
@@ -40,7 +41,7 @@ library
4041 --
4142 -- note: mtl lower bound is so low because of GHC-7.8
4243 build-depends:
43− base >= 4.7 && < 4.12
44+ base >= 4.7 && < 4.13
4445 , bytestring >= 0.10.4.0 && < 0.11
4546 , text >= 1.2.3.0 && < 1.3
4647
servant-foreign/servant-foreign.cabal+2−1
@@ -26,6 +26,7 @@ tested-with:
2626 GHC==8.0.2
2727 GHC==8.2.2
2828 GHC==8.4.3
29+ GHC==8.6.1
2930
3031source-repository head
3132 type: git
@@ -41,7 +42,7 @@ library
4142 --
4243 -- note: mtl lower bound is so low because of GHC-7.8
4344 build-depends:
44− base >= 4.7 && <4.12
45+ base >= 4.7 && <4.13
4546 , text >= 1.2.3.0 && < 1.3
4647
4748 -- Servant dependencies
servant-server/servant-server.cabal+4−3
@@ -25,6 +25,7 @@ tested-with:
2525 GHC==8.0.2
2626 GHC==8.2.2
2727 GHC==8.4.3
28+ GHC==8.6.1
2829extra-source-files:
2930 CHANGELOG.md
3031 README.md
@@ -63,9 +64,9 @@ library
6364 --
6465 -- note: mtl lower bound is so low because of GHC-7.8
6566 build-depends:
66− base >= 4.7 && < 4.12
67+ base >= 4.7 && < 4.13
6768 , bytestring >= 0.10.4.0 && < 0.11
68− , containers >= 0.5.5.1 && < 0.6
69+ , containers >= 0.5.5.1 && < 0.7
6970 , mtl >= 2.1 && < 2.3
7071 , text >= 1.2.3.0 && < 1.3
7172 , transformers >= 0.3.0.0 && < 0.6
@@ -90,7 +91,7 @@ library
9091 , http-types >= 0.12.1 && < 0.13
9192 , network-uri >= 2.6.1.0 && < 2.7
9293 , monad-control >= 1.0.2.3 && < 1.1
93− , network >= 2.6.3.5 && < 2.8
94+ , network >= 2.6.3.5 && < 2.9
9495 , string-conversions >= 0.4.0.1 && < 0.5
9596 , resourcet >= 1.1.11 && < 1.3
9697 , tagged >= 0.8.5 && < 0.9
servant/servant.cabal+2−1
@@ -21,6 +21,7 @@ tested-with:
2121 GHC==8.0.2
2222 GHC==8.2.2
2323 GHC==8.4.3
24+ GHC==8.6.1
2425extra-source-files:
2526 CHANGELOG.md
2627source-repository head
@@ -71,7 +72,7 @@ library
7172 --
7273 -- note: mtl lower bound is so low because of GHC-7.8
7374 build-depends:
74− base >= 4.9 && < 4.12
75+ base >= 4.9 && < 4.13
7576 , bytestring >= 0.10.8.1 && < 0.11
7677 , mtl >= 2.1 && < 2.3
7778 , text >= 1.2.3.0 && < 1.3