git.iko.soy/servant
on master help sign in
Merge pull request #1051 from phadej/ghc-8.6

GHC-8.6 for 0.14

commitd823307e750c3dc75538cfd8f2efbb4f9d81149c authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 14 Oct 2018, 16:41 (8 years ago) parentd64a66212d2a8c
21 files changed+120−57
compare with master
unifiedsplit
.travis.yml+23−30 cabal.make-travis-yml+1−1 cabal.project+5−2 doc/cookbook/basic-auth/basic-auth.cabal+7−1 doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+7−1 doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+7−1 doc/cookbook/file-upload/file-upload.cabal+7−1 doc/cookbook/generic/generic.cabal+7−1 doc/cookbook/https/https.cabal+7−1 doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+7−1 doc/cookbook/pagination/pagination.cabal+8−2 doc/cookbook/structuring-apis/structuring-apis.cabal+7−1 doc/cookbook/using-custom-monad/using-custom-monad.cabal+7−1 doc/tutorial/tutorial.cabal+2−1 servant-client-core/servant-client-core.cabal+3−2 servant-client-ghcjs/servant-client-ghcjs.cabal+2−2 servant-client/servant-client.cabal+4−3 servant-docs/servant-docs.cabal+2−1 servant-foreign/servant-foreign.cabal+2−1 servant-server/servant-server.cabal+3−2 servant/servant.cabal+2−1
.travis.yml+23−30
@@ -2,7 +2,7 @@
22#
33# runghc make_travis_yml_2.hs '--config=cabal.make-travis-yml' '--output=.travis.yml' 'cabal.project'
44#
5−# For more information, see https://github.com/hvr/multi-ghc-travis
5+# For more information, see https://github.com/haskell-CI/haskell-ci
66#
77language: c
88sudo: false
@@ -33,21 +33,24 @@ before_cache:
3333
3434matrix:
3535 include:
36+ - compiler: "ghc-8.6.1"
37+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
38+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
3639 - compiler: "ghc-8.4.3"
3740 # env: TEST=--disable-tests BENCH=--disable-benchmarks
38− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
41+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
3942 - compiler: "ghc-8.2.2"
4043 # env: TEST=--disable-tests BENCH=--disable-benchmarks
41− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
44+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4245 - compiler: "ghc-8.0.2"
4346 # env: TEST=--disable-tests BENCH=--disable-benchmarks
44− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
47+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4548 - compiler: "ghc-7.10.3"
4649 # env: TEST=--disable-tests BENCH=--disable-benchmarks
47− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
50+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
4851 - compiler: "ghc-7.8.4"
4952 # env: TEST=--disable-tests BENCH=--disable-benchmarks
50− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
53+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
5154
5255before_install:
5356 - HC=${CC}
@@ -73,11 +76,11 @@ install:
7376 - rm -fv cabal.project cabal.project.local
7477 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
7578 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
76− - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/basic-auth\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/https\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/pagination\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\"\\n' > cabal.project"
77− - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
78− - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
79+ - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/basic-auth\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/generic\" \"doc/cookbook/https\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\"\\n' > cabal.project"
80+ - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12, containers installed' >> cabal.project"
81+ - "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"
7982 - touch cabal.project.local
80− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
83+ - "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-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-structuring-apis | grep -vw -- cookbook-using-custom-monad | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
8184 - cat cabal.project || true
8285 - cat cabal.project.local || true
8386 - if [ -f "servant/configure.ac" ]; then
@@ -113,15 +116,12 @@ install:
113116 - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then
114117 (cd "doc/cookbook/file-upload" && autoreconf -i);
115118 fi
119+ - if [ -f "doc/cookbook/generic/configure.ac" ]; then
120+ (cd "doc/cookbook/generic" && autoreconf -i);
121+ fi
116122 - if [ -f "doc/cookbook/https/configure.ac" ]; then
117123 (cd "doc/cookbook/https" && autoreconf -i);
118124 fi
119− - if [ -f "doc/cookbook/jwt-and-basic-auth/configure.ac" ]; then
120− (cd "doc/cookbook/jwt-and-basic-auth" && autoreconf -i);
121− fi
122− - if [ -f "doc/cookbook/pagination/configure.ac" ]; then
123− (cd "doc/cookbook/pagination" && autoreconf -i);
124− fi
125125 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then
126126 (cd "doc/cookbook/structuring-apis" && autoreconf -i);
127127 fi
@@ -129,7 +129,7 @@ install:
129129 (cd "doc/cookbook/using-custom-monad" && autoreconf -i);
130130 fi
131131 - rm -f cabal.project.freeze
132− - 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/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/file-upload"/dist "doc/cookbook/https"/dist "doc/cookbook/jwt-and-basic-auth"/dist "doc/cookbook/pagination"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist
132+ - 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/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/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist
133133 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
134134
135135# Here starts the actual work to be performed for the package under test;
@@ -148,21 +148,20 @@ script:
148148 - (cd "doc/cookbook/db-postgres-pool" && cabal sdist)
149149 - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist)
150150 - (cd "doc/cookbook/file-upload" && cabal sdist)
151+ - (cd "doc/cookbook/generic" && cabal sdist)
151152 - (cd "doc/cookbook/https" && cabal sdist)
152− - (cd "doc/cookbook/jwt-and-basic-auth" && cabal sdist)
153− - (cd "doc/cookbook/pagination" && cabal sdist)
154153 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
155154 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
156155 - echo -en 'travis_fold:end:sdist\\r'
157156 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
158− - 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/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/https"/dist/cookbook-https-*.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 ${DISTDIR}/
157+ - 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/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/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz ${DISTDIR}/
159158 - cd ${DISTDIR} || false
160159 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
161− - "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-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-https-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-pagination-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal\\n' > cabal.project"
162− - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
163− - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
160+ - "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-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-https-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal\\n' > cabal.project"
161+ - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12, containers installed' >> cabal.project"
162+ - "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"
164163 - touch cabal.project.local
165− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
164+ - "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-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-structuring-apis | grep -vw -- cookbook-using-custom-monad | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
166165 - cat cabal.project || true
167166 - cat cabal.project.local || true
168167 - echo -en 'travis_fold:end:unpack\\r'
@@ -175,14 +174,8 @@ script:
175174
176175 - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'
177176 # haddock
178− - rm -rf ./dist-newstyle
179177 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
180178
181179 - echo -en 'travis_fold:end:haddock\\r'
182− - echo Building without installed constraints for packages in global-db... && echo -en 'travis_fold:start:build-installed\\r'
183− # Build without installed constraints for packages in global-db
184− - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
185−
186− - echo -en 'travis_fold:end:build-installed\\r'
187180# REGENDATA ["--config=cabal.make-travis-yml","--output=.travis.yml","cabal.project"]
188181# EOF
cabal.make-travis-yml+1−1
@@ -6,7 +6,7 @@ install-dependencies-step: False
66
77-- this speed-ups the build a little, but we have to check these for release
88no-tests-no-benchmarks: False
9−build-with-installed-step: False
9+unconstrained-step: False
1010
1111-- Don't run cabal check, as cookbook examples won't pass it
1212cabal-check: False
cabal.project+5−2
@@ -14,8 +14,8 @@ packages: servant/
1414 doc/cookbook/file-upload
1515 doc/cookbook/generic
1616 doc/cookbook/https
17− doc/cookbook/jwt-and-basic-auth
18− doc/cookbook/pagination
17+ -- doc/cookbook/jwt-and-basic-auth
18+ -- doc/cookbook/pagination
1919 doc/cookbook/structuring-apis
2020 doc/cookbook/using-custom-monad
2121
@@ -28,6 +28,9 @@ constraints:
2828 foundation >=0.0.14,
2929 memory <0.14.12 || >0.14.12
3030
31+constraints: containers installed
32+
3133allow-newer:
34+ servant-js:base,
3235 servant-pagination:servant,
3336 servant-pagination:servant-server
doc/cookbook/basic-auth/basic-auth.cabal+7−1
@@ -8,7 +8,13 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with:
12+ GHC==7.8.4
13+ GHC==7.10.3
14+ GHC==8.0.2
15+ GHC==8.2.2
16+ GHC==8.4.3
17+ GHC==8.6.1
1218
1319executable cookbook-basic-auth
1420 main-is: BasicAuth.lhs
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+7−1
@@ -8,7 +8,13 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with:
12+ GHC==7.8.4
13+ GHC==7.10.3
14+ GHC==8.0.2
15+ GHC==8.2.2
16+ GHC==8.4.3
17+ GHC==8.6.1
1218
1319executable cookbook-db-postgres-pool
1420 main-is: PostgresPool.lhs
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+7−1
@@ -8,7 +8,13 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with:
12+ GHC==7.8.4
13+ GHC==7.10.3
14+ GHC==8.0.2
15+ GHC==8.2.2
16+ GHC==8.4.3
17+ GHC==8.6.1
1218
1319executable cookbook-db-sqlite-simple
1420 main-is: DBConnection.lhs
doc/cookbook/file-upload/file-upload.cabal+7−1
@@ -8,7 +8,13 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with:
12+ GHC==7.8.4
13+ GHC==7.10.3
14+ GHC==8.0.2
15+ GHC==8.2.2
16+ GHC==8.4.3
17+ GHC==8.6.1
1218
1319executable cookbook-file-upload
1420 main-is: FileUpload.lhs
doc/cookbook/generic/generic.cabal+7−1
@@ -8,7 +8,13 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with:
12+ GHC==7.8.4
13+ GHC==7.10.3
14+ GHC==8.0.2
15+ GHC==8.2.2
16+ GHC==8.4.3
17+ GHC==8.6.1
1218
1319executable cookbook-using-custom-monad
1420 main-is: Generic.lhs
doc/cookbook/https/https.cabal+7−1
@@ -8,7 +8,13 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with:
12+ GHC==7.8.4
13+ GHC==7.10.3
14+ GHC==8.0.2
15+ GHC==8.2.2
16+ GHC==8.4.3
17+ GHC==8.6.1
1218
1319executable cookbook-https
1420 main-is: Https.lhs
doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+7−1
@@ -11,7 +11,13 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1111category: Servant
1212build-type: Simple
1313cabal-version: >=1.10
14−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
14+tested-with:
15+ GHC==7.8.4
16+ GHC==7.10.3
17+ GHC==8.0.2
18+ GHC==8.2.2
19+ GHC==8.4.3
20+ GHC==8.6.1
1521
1622executable cookbook-jwt-and-basic-auth
1723 if !impl(ghc >= 7.10)
doc/cookbook/pagination/pagination.cabal+8−2
@@ -11,7 +11,13 @@ cabal-version: >=1.10
1111extra-source-files:
1212 Pagination.lhs
1313 dummy/Pagination.lhs
14−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
14+tested-with:
15+ GHC==7.8.4
16+ GHC==7.10.3
17+ GHC==8.0.2
18+ GHC==8.2.2
19+ GHC==8.4.3
20+ GHC==8.6.1
1521
1622executable cookbook-pagination
1723 main-is: Pagination.lhs
@@ -21,7 +27,7 @@ executable cookbook-pagination
2127
2228 if impl(ghc >= 8.0)
2329 hs-source-dirs: .
24− build-depends: base >= 4.8 && <4.12
30+ build-depends: base >= 4.8
2531 , aeson
2632 , servant
2733 , servant-server
doc/cookbook/structuring-apis/structuring-apis.cabal+7−1
@@ -8,7 +8,13 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with:
12+ GHC==7.8.4
13+ GHC==7.10.3
14+ GHC==8.0.2
15+ GHC==8.2.2
16+ GHC==8.4.3
17+ GHC==8.6.1
1218
1319executable cookbook-structuring-apis
1420 main-is: StructuringApis.lhs
doc/cookbook/using-custom-monad/using-custom-monad.cabal+7−1
@@ -8,7 +8,13 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with:
12+ GHC==7.8.4
13+ GHC==7.10.3
14+ GHC==8.0.2
15+ GHC==8.2.2
16+ GHC==8.4.3
17+ GHC==8.6.1
1218
1319executable cookbook-using-custom-monad
1420 main-is: UsingCustomMonad.lhs
doc/tutorial/tutorial.cabal+2−1
@@ -18,6 +18,7 @@ tested-with:
1818 GHC==8.0.2
1919 GHC==8.2.2
2020 GHC==8.4.3
21+ GHC==8.6.1
2122extra-source-files:
2223 static/index.html
2324 static/ui.js
@@ -35,7 +36,7 @@ library
3536 -- Packages `servant` depends on.
3637 -- We don't need to specify bounds here as this package is never released.
3738 build-depends:
38− base >= 4.7 && <4.12
39+ base >= 4.7 && <4.13
3940 , aeson
4041 , aeson-compat
4142 , attoparsec
servant-client-core/servant-client-core.cabal+3−2
@@ -24,6 +24,7 @@ tested-with:
2424 GHC==8.0.2
2525 GHC==8.2.2
2626 GHC==8.4.3
27+ GHC==8.6.1
2728
2829source-repository head
2930 type: git
@@ -49,9 +50,9 @@ library
4950 --
5051 -- note: mtl lower bound is so low because of GHC-7.8
5152 build-depends:
52− base >= 4.7 && < 4.12
53+ base >= 4.7 && < 4.13
5354 , bytestring >= 0.10.4.0 && < 0.11
54− , containers >= 0.5.5.1 && < 0.6
55+ , containers >= 0.5.5.1 && < 0.7
5556 , text >= 1.2.3.0 && < 1.3
5657
5758 if !impl(ghc >= 8.0)
servant-client-ghcjs/servant-client-ghcjs.cabal+2−2
@@ -31,10 +31,10 @@ library
3131 Servant.Client.Ghcjs
3232 Servant.Client.Internal.XhrClient
3333 build-depends:
34− base >= 4.7 && < 4.12
34+ base >= 4.7 && < 4.13
3535 , bytestring >= 0.10 && < 0.11
3636 , case-insensitive >= 1.2.0.0 && < 1.3.0.0
37− , containers >= 0.5 && < 0.6
37+ , containers >= 0.5 && < 0.7
3838 , exceptions >= 0.8 && < 0.11
3939 , ghcjs-base >= 0.2.0.0 && < 0.3.0.0
4040 , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0
servant-client/servant-client.cabal+4−3
@@ -22,6 +22,7 @@ tested-with:
2222 GHC==8.0.2
2323 GHC==8.2.2
2424 GHC==8.4.3
25+ GHC==8.6.1
2526homepage: http://haskell-servant.readthedocs.org/
2627Bug-reports: http://github.com/haskell-servant/servant/issues
2728extra-source-files:
@@ -42,9 +43,9 @@ library
4243 --
4344 -- note: mtl lower bound is so low because of GHC-7.8
4445 build-depends:
45− base >= 4.7 && < 4.12
46+ base >= 4.7 && < 4.13
4647 , bytestring >= 0.10.4.0 && < 0.11
47− , containers >= 0.5.5.1 && < 0.6
48+ , containers >= 0.5.5.1 && < 0.7
4849 , mtl >= 2.1 && < 2.3
4950 , text >= 1.2.3.0 && < 1.3
5051 , time >= 1.4.2 && < 1.9
@@ -67,7 +68,7 @@ library
6768 , exceptions >= 0.10.0 && < 0.11
6869 , monad-control >= 1.0.2.3 && < 1.1
6970 , semigroupoids >= 5.2.2 && < 5.4
70− , stm >= 2.4.5.0 && < 2.5
71+ , stm >= 2.4.5.0 && < 2.6
7172 , transformers-base >= 0.4.5.2 && < 0.5
7273 , transformers-compat >= 0.6.2 && < 0.7
7374
servant-docs/servant-docs.cabal+2−1
@@ -22,6 +22,7 @@ tested-with:
2222 GHC==8.0.2
2323 GHC==8.2.2
2424 GHC==8.4.3
25+ GHC==8.6.1
2526homepage: http://haskell-servant.readthedocs.org/
2627Bug-reports: http://github.com/haskell-servant/servant/issues
2728extra-source-files:
@@ -43,7 +44,7 @@ library
4344 --
4445 -- note: mtl lower bound is so low because of GHC-7.8
4546 build-depends:
46− base >= 4.7 && < 4.12
47+ base >= 4.7 && < 4.13
4748 , bytestring >= 0.10.4.0 && < 0.11
4849 , text >= 1.2.3.0 && < 1.3
4950
servant-foreign/servant-foreign.cabal+2−1
@@ -29,6 +29,7 @@ tested-with:
2929 GHC==8.0.2
3030 GHC==8.2.2
3131 GHC==8.4.3
32+ GHC==8.6.1
3233
3334source-repository head
3435 type: git
@@ -44,7 +45,7 @@ library
4445 --
4546 -- note: mtl lower bound is so low because of GHC-7.8
4647 build-depends:
47− base >= 4.7 && <4.12
48+ base >= 4.7 && <4.13
4849 , text >= 1.2.3.0 && < 1.3
4950
5051 if !impl(ghc >= 8.0)
servant-server/servant-server.cabal+3−2
@@ -27,6 +27,7 @@ tested-with:
2727 GHC==8.0.2
2828 GHC==8.2.2
2929 GHC==8.4.3
30+ GHC==8.6.1
3031extra-source-files:
3132 include/*.h
3233 CHANGELOG.md
@@ -66,9 +67,9 @@ library
6667 --
6768 -- note: mtl lower bound is so low because of GHC-7.8
6869 build-depends:
69− base >= 4.7 && < 4.12
70+ base >= 4.7 && < 4.13
7071 , bytestring >= 0.10.4.0 && < 0.11
71− , containers >= 0.5.5.1 && < 0.6
72+ , containers >= 0.5.5.1 && < 0.7
7273 , mtl >= 2.1 && < 2.3
7374 , text >= 1.2.3.0 && < 1.3
7475 , transformers >= 0.3.0.0 && < 0.6
servant/servant.cabal+2−1
@@ -23,6 +23,7 @@ tested-with:
2323 GHC==8.0.2
2424 GHC==8.2.2
2525 GHC==8.4.3
26+ GHC==8.6.1
2627extra-source-files:
2728 include/*.h
2829 CHANGELOG.md
@@ -75,7 +76,7 @@ library
7576 --
7677 -- note: mtl lower bound is so low because of GHC-7.8
7778 build-depends:
78− base >= 4.7 && < 4.12
79+ base >= 4.7 && < 4.13
7980 , bytestring >= 0.10.4.0 && < 0.11
8081 , mtl >= 2.1 && < 2.3
8182 , text >= 1.2.3.0 && < 1.3