git.iko.soy/servant
on master help sign in
Merge pull request #1051 from phadej/ghc-8.6
d823307Oleg Grenrus
.travis.yml+23−30
compare with master
unifiedsplit
@@ -2,7 +2,7 @@
2#
2#
3# runghc make_travis_yml_2.hs '--config=cabal.make-travis-yml' '--output=.travis.yml' 'cabal.project'
3# runghc make_travis_yml_2.hs '--config=cabal.make-travis-yml' '--output=.travis.yml' 'cabal.project'
4#
4#
5−# For more information, see https://github.com/hvr/multi-ghc-travis
5+# For more information, see https://github.com/haskell-CI/haskell-ci
6#
6#
7language: c
7language: c
8sudo: false
8sudo: false
@@ -33,21 +33,24 @@ before_cache:
33
33
34matrix:
34matrix:
35 include:
35 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]}}
36 - compiler: "ghc-8.4.3"
39 - compiler: "ghc-8.4.3"
37 # env: TEST=--disable-tests BENCH=--disable-benchmarks
40 # 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]}}
39 - compiler: "ghc-8.2.2"
42 - compiler: "ghc-8.2.2"
40 # env: TEST=--disable-tests BENCH=--disable-benchmarks
43 # 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]}}
42 - compiler: "ghc-8.0.2"
45 - compiler: "ghc-8.0.2"
43 # env: TEST=--disable-tests BENCH=--disable-benchmarks
46 # 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]}}
45 - compiler: "ghc-7.10.3"
48 - compiler: "ghc-7.10.3"
46 # env: TEST=--disable-tests BENCH=--disable-benchmarks
49 # 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]}}
48 - compiler: "ghc-7.8.4"
51 - compiler: "ghc-7.8.4"
49 # env: TEST=--disable-tests BENCH=--disable-benchmarks
52 # 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]}}
51
54
52before_install:
55before_install:
53 - HC=${CC}
56 - HC=${CC}
@@ -73,11 +76,11 @@ install:
73 - rm -fv cabal.project cabal.project.local
76 - rm -fv cabal.project cabal.project.local
74 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
77 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
75 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
78 - 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"
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"
77− - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
80+ - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12, containers installed' >> 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"
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"
79 - touch cabal.project.local
82 - 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"
81 - cat cabal.project || true
84 - cat cabal.project || true
82 - cat cabal.project.local || true
85 - cat cabal.project.local || true
83 - if [ -f "servant/configure.ac" ]; then
86 - if [ -f "servant/configure.ac" ]; then
@@ -113,15 +116,12 @@ install:
113 - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then
116 - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then
114 (cd "doc/cookbook/file-upload" && autoreconf -i);
117 (cd "doc/cookbook/file-upload" && autoreconf -i);
115 fi
118 fi
119+ - if [ -f "doc/cookbook/generic/configure.ac" ]; then
120+ (cd "doc/cookbook/generic" && autoreconf -i);
121+ fi
116 - if [ -f "doc/cookbook/https/configure.ac" ]; then
122 - if [ -f "doc/cookbook/https/configure.ac" ]; then
117 (cd "doc/cookbook/https" && autoreconf -i);
123 (cd "doc/cookbook/https" && autoreconf -i);
118 fi
124 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
125 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then
125 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then
126 (cd "doc/cookbook/structuring-apis" && autoreconf -i);
126 (cd "doc/cookbook/structuring-apis" && autoreconf -i);
127 fi
127 fi
@@ -129,7 +129,7 @@ install:
129 (cd "doc/cookbook/using-custom-monad" && autoreconf -i);
129 (cd "doc/cookbook/using-custom-monad" && autoreconf -i);
130 fi
130 fi
131 - rm -f cabal.project.freeze
131 - 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
133 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
133 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
134
134
135# Here starts the actual work to be performed for the package under test;
135# Here starts the actual work to be performed for the package under test;
@@ -148,21 +148,20 @@ script:
148 - (cd "doc/cookbook/db-postgres-pool" && cabal sdist)
148 - (cd "doc/cookbook/db-postgres-pool" && cabal sdist)
149 - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist)
149 - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist)
150 - (cd "doc/cookbook/file-upload" && cabal sdist)
150 - (cd "doc/cookbook/file-upload" && cabal sdist)
151+ - (cd "doc/cookbook/generic" && cabal sdist)
151 - (cd "doc/cookbook/https" && cabal sdist)
152 - (cd "doc/cookbook/https" && cabal sdist)
152− - (cd "doc/cookbook/jwt-and-basic-auth" && cabal sdist)
153− - (cd "doc/cookbook/pagination" && cabal sdist)
154 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
153 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
155 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
154 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
156 - echo -en 'travis_fold:end:sdist\\r'
155 - echo -en 'travis_fold:end:sdist\\r'
157 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
156 - 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}/
159 - cd ${DISTDIR} || false
158 - cd ${DISTDIR} || false
160 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
159 - 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"
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"
162− - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
161+ - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12, containers installed' >> 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"
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"
164 - touch cabal.project.local
163 - 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"
166 - cat cabal.project || true
165 - cat cabal.project || true
167 - cat cabal.project.local || true
166 - cat cabal.project.local || true
168 - echo -en 'travis_fold:end:unpack\\r'
167 - echo -en 'travis_fold:end:unpack\\r'
@@ -175,14 +174,8 @@ script:
175
174
176 - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'
175 - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'
177 # haddock
176 # haddock
178− - rm -rf ./dist-newstyle
179 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
177 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
180
178
181 - echo -en 'travis_fold:end:haddock\\r'
179 - 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'
187# REGENDATA ["--config=cabal.make-travis-yml","--output=.travis.yml","cabal.project"]
180# REGENDATA ["--config=cabal.make-travis-yml","--output=.travis.yml","cabal.project"]
188# EOF
181# EOF
cabal.make-travis-yml+1−1
@@ -6,7 +6,7 @@ install-dependencies-step: False
6
6
7-- this speed-ups the build a little, but we have to check these for release
7-- this speed-ups the build a little, but we have to check these for release
8no-tests-no-benchmarks: False
8no-tests-no-benchmarks: False
9−build-with-installed-step: False
9+unconstrained-step: False
10
10
11-- Don't run cabal check, as cookbook examples won't pass it
11-- Don't run cabal check, as cookbook examples won't pass it
12cabal-check: False
12cabal-check: False
cabal.project+5−2
@@ -14,8 +14,8 @@ packages: servant/
14 doc/cookbook/file-upload
14 doc/cookbook/file-upload
15 doc/cookbook/generic
15 doc/cookbook/generic
16 doc/cookbook/https
16 doc/cookbook/https
17− doc/cookbook/jwt-and-basic-auth
17+ -- doc/cookbook/jwt-and-basic-auth
18− doc/cookbook/pagination
18+ -- doc/cookbook/pagination
19 doc/cookbook/structuring-apis
19 doc/cookbook/structuring-apis
20 doc/cookbook/using-custom-monad
20 doc/cookbook/using-custom-monad
21
21
@@ -28,6 +28,9 @@ constraints:
28 foundation >=0.0.14,
28 foundation >=0.0.14,
29 memory <0.14.12 || >0.14.12
29 memory <0.14.12 || >0.14.12
30
30
31+constraints: containers installed
32+
31allow-newer:
33allow-newer:
34+ servant-js:base,
32 servant-pagination:servant,
35 servant-pagination:servant,
33 servant-pagination:servant-server
36 servant-pagination:servant-server
doc/cookbook/basic-auth/basic-auth.cabal+7−1
@@ -8,7 +8,13 @@ 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==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
12
18
13executable cookbook-basic-auth
19executable cookbook-basic-auth
14 main-is: BasicAuth.lhs
20 main-is: BasicAuth.lhs
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+7−1
@@ -8,7 +8,13 @@ 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==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
12
18
13executable cookbook-db-postgres-pool
19executable cookbook-db-postgres-pool
14 main-is: PostgresPool.lhs
20 main-is: PostgresPool.lhs
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+7−1
@@ -8,7 +8,13 @@ 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==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
12
18
13executable cookbook-db-sqlite-simple
19executable cookbook-db-sqlite-simple
14 main-is: DBConnection.lhs
20 main-is: DBConnection.lhs
doc/cookbook/file-upload/file-upload.cabal+7−1
@@ -8,7 +8,13 @@ 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==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
12
18
13executable cookbook-file-upload
19executable cookbook-file-upload
14 main-is: FileUpload.lhs
20 main-is: FileUpload.lhs
doc/cookbook/generic/generic.cabal+7−1
@@ -8,7 +8,13 @@ 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==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
12
18
13executable cookbook-using-custom-monad
19executable cookbook-using-custom-monad
14 main-is: Generic.lhs
20 main-is: Generic.lhs
doc/cookbook/https/https.cabal+7−1
@@ -8,7 +8,13 @@ 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==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
12
18
13executable cookbook-https
19executable cookbook-https
14 main-is: Https.lhs
20 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
11category: Servant
11category: Servant
12build-type: Simple
12build-type: Simple
13cabal-version: >=1.10
13cabal-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
15
21
16executable cookbook-jwt-and-basic-auth
22executable cookbook-jwt-and-basic-auth
17 if !impl(ghc >= 7.10)
23 if !impl(ghc >= 7.10)
doc/cookbook/pagination/pagination.cabal+8−2
@@ -11,7 +11,13 @@ cabal-version: >=1.10
11extra-source-files:
11extra-source-files:
12 Pagination.lhs
12 Pagination.lhs
13 dummy/Pagination.lhs
13 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
15
21
16executable cookbook-pagination
22executable cookbook-pagination
17 main-is: Pagination.lhs
23 main-is: Pagination.lhs
@@ -21,7 +27,7 @@ executable cookbook-pagination
21
27
22 if impl(ghc >= 8.0)
28 if impl(ghc >= 8.0)
23 hs-source-dirs: .
29 hs-source-dirs: .
24− build-depends: base >= 4.8 && <4.12
30+ build-depends: base >= 4.8
25 , aeson
31 , aeson
26 , servant
32 , servant
27 , servant-server
33 , servant-server
doc/cookbook/structuring-apis/structuring-apis.cabal+7−1
@@ -8,7 +8,13 @@ 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==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
12
18
13executable cookbook-structuring-apis
19executable cookbook-structuring-apis
14 main-is: StructuringApis.lhs
20 main-is: StructuringApis.lhs
doc/cookbook/using-custom-monad/using-custom-monad.cabal+7−1
@@ -8,7 +8,13 @@ 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==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
12
18
13executable cookbook-using-custom-monad
19executable cookbook-using-custom-monad
14 main-is: UsingCustomMonad.lhs
20 main-is: UsingCustomMonad.lhs
doc/tutorial/tutorial.cabal+2−1
@@ -18,6 +18,7 @@ tested-with:
18 GHC==8.0.2
18 GHC==8.0.2
19 GHC==8.2.2
19 GHC==8.2.2
20 GHC==8.4.3
20 GHC==8.4.3
21+ GHC==8.6.1
21extra-source-files:
22extra-source-files:
22 static/index.html
23 static/index.html
23 static/ui.js
24 static/ui.js
@@ -35,7 +36,7 @@ library
35 -- Packages `servant` depends on.
36 -- Packages `servant` depends on.
36 -- We don't need to specify bounds here as this package is never released.
37 -- We don't need to specify bounds here as this package is never released.
37 build-depends:
38 build-depends:
38− base >= 4.7 && <4.12
39+ base >= 4.7 && <4.13
39 , aeson
40 , aeson
40 , aeson-compat
41 , aeson-compat
41 , attoparsec
42 , attoparsec
servant-client-core/servant-client-core.cabal+3−2
@@ -24,6 +24,7 @@ tested-with:
24 GHC==8.0.2
24 GHC==8.0.2
25 GHC==8.2.2
25 GHC==8.2.2
26 GHC==8.4.3
26 GHC==8.4.3
27+ GHC==8.6.1
27
28
28source-repository head
29source-repository head
29 type: git
30 type: git
@@ -49,9 +50,9 @@ library
49 --
50 --
50 -- note: mtl lower bound is so low because of GHC-7.8
51 -- note: mtl lower bound is so low because of GHC-7.8
51 build-depends:
52 build-depends:
52− base >= 4.7 && < 4.12
53+ base >= 4.7 && < 4.13
53 , bytestring >= 0.10.4.0 && < 0.11
54 , bytestring >= 0.10.4.0 && < 0.11
54− , containers >= 0.5.5.1 && < 0.6
55+ , containers >= 0.5.5.1 && < 0.7
55 , text >= 1.2.3.0 && < 1.3
56 , text >= 1.2.3.0 && < 1.3
56
57
57 if !impl(ghc >= 8.0)
58 if !impl(ghc >= 8.0)
servant-client-ghcjs/servant-client-ghcjs.cabal+2−2
@@ -31,10 +31,10 @@ library
31 Servant.Client.Ghcjs
31 Servant.Client.Ghcjs
32 Servant.Client.Internal.XhrClient
32 Servant.Client.Internal.XhrClient
33 build-depends:
33 build-depends:
34− base >= 4.7 && < 4.12
34+ base >= 4.7 && < 4.13
35 , bytestring >= 0.10 && < 0.11
35 , bytestring >= 0.10 && < 0.11
36 , case-insensitive >= 1.2.0.0 && < 1.3.0.0
36 , case-insensitive >= 1.2.0.0 && < 1.3.0.0
37− , containers >= 0.5 && < 0.6
37+ , containers >= 0.5 && < 0.7
38 , exceptions >= 0.8 && < 0.11
38 , exceptions >= 0.8 && < 0.11
39 , ghcjs-base >= 0.2.0.0 && < 0.3.0.0
39 , ghcjs-base >= 0.2.0.0 && < 0.3.0.0
40 , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0
40 , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0
servant-client/servant-client.cabal+4−3
@@ -22,6 +22,7 @@ tested-with:
22 GHC==8.0.2
22 GHC==8.0.2
23 GHC==8.2.2
23 GHC==8.2.2
24 GHC==8.4.3
24 GHC==8.4.3
25+ GHC==8.6.1
25homepage: http://haskell-servant.readthedocs.org/
26homepage: http://haskell-servant.readthedocs.org/
26Bug-reports: http://github.com/haskell-servant/servant/issues
27Bug-reports: http://github.com/haskell-servant/servant/issues
27extra-source-files:
28extra-source-files:
@@ -42,9 +43,9 @@ library
42 --
43 --
43 -- note: mtl lower bound is so low because of GHC-7.8
44 -- note: mtl lower bound is so low because of GHC-7.8
44 build-depends:
45 build-depends:
45− base >= 4.7 && < 4.12
46+ base >= 4.7 && < 4.13
46 , bytestring >= 0.10.4.0 && < 0.11
47 , bytestring >= 0.10.4.0 && < 0.11
47− , containers >= 0.5.5.1 && < 0.6
48+ , containers >= 0.5.5.1 && < 0.7
48 , mtl >= 2.1 && < 2.3
49 , mtl >= 2.1 && < 2.3
49 , text >= 1.2.3.0 && < 1.3
50 , text >= 1.2.3.0 && < 1.3
50 , time >= 1.4.2 && < 1.9
51 , time >= 1.4.2 && < 1.9
@@ -67,7 +68,7 @@ library
67 , exceptions >= 0.10.0 && < 0.11
68 , exceptions >= 0.10.0 && < 0.11
68 , monad-control >= 1.0.2.3 && < 1.1
69 , monad-control >= 1.0.2.3 && < 1.1
69 , semigroupoids >= 5.2.2 && < 5.4
70 , semigroupoids >= 5.2.2 && < 5.4
70− , stm >= 2.4.5.0 && < 2.5
71+ , stm >= 2.4.5.0 && < 2.6
71 , transformers-base >= 0.4.5.2 && < 0.5
72 , transformers-base >= 0.4.5.2 && < 0.5
72 , transformers-compat >= 0.6.2 && < 0.7
73 , transformers-compat >= 0.6.2 && < 0.7
73
74
servant-docs/servant-docs.cabal+2−1
@@ -22,6 +22,7 @@ tested-with:
22 GHC==8.0.2
22 GHC==8.0.2
23 GHC==8.2.2
23 GHC==8.2.2
24 GHC==8.4.3
24 GHC==8.4.3
25+ GHC==8.6.1
25homepage: http://haskell-servant.readthedocs.org/
26homepage: http://haskell-servant.readthedocs.org/
26Bug-reports: http://github.com/haskell-servant/servant/issues
27Bug-reports: http://github.com/haskell-servant/servant/issues
27extra-source-files:
28extra-source-files:
@@ -43,7 +44,7 @@ library
43 --
44 --
44 -- note: mtl lower bound is so low because of GHC-7.8
45 -- note: mtl lower bound is so low because of GHC-7.8
45 build-depends:
46 build-depends:
46− base >= 4.7 && < 4.12
47+ base >= 4.7 && < 4.13
47 , bytestring >= 0.10.4.0 && < 0.11
48 , bytestring >= 0.10.4.0 && < 0.11
48 , text >= 1.2.3.0 && < 1.3
49 , text >= 1.2.3.0 && < 1.3
49
50
servant-foreign/servant-foreign.cabal+2−1
@@ -29,6 +29,7 @@ tested-with:
29 GHC==8.0.2
29 GHC==8.0.2
30 GHC==8.2.2
30 GHC==8.2.2
31 GHC==8.4.3
31 GHC==8.4.3
32+ GHC==8.6.1
32
33
33source-repository head
34source-repository head
34 type: git
35 type: git
@@ -44,7 +45,7 @@ library
44 --
45 --
45 -- note: mtl lower bound is so low because of GHC-7.8
46 -- note: mtl lower bound is so low because of GHC-7.8
46 build-depends:
47 build-depends:
47− base >= 4.7 && <4.12
48+ base >= 4.7 && <4.13
48 , text >= 1.2.3.0 && < 1.3
49 , text >= 1.2.3.0 && < 1.3
49
50
50 if !impl(ghc >= 8.0)
51 if !impl(ghc >= 8.0)
servant-server/servant-server.cabal+3−2
@@ -27,6 +27,7 @@ tested-with:
27 GHC==8.0.2
27 GHC==8.0.2
28 GHC==8.2.2
28 GHC==8.2.2
29 GHC==8.4.3
29 GHC==8.4.3
30+ GHC==8.6.1
30extra-source-files:
31extra-source-files:
31 include/*.h
32 include/*.h
32 CHANGELOG.md
33 CHANGELOG.md
@@ -66,9 +67,9 @@ library
66 --
67 --
67 -- note: mtl lower bound is so low because of GHC-7.8
68 -- note: mtl lower bound is so low because of GHC-7.8
68 build-depends:
69 build-depends:
69− base >= 4.7 && < 4.12
70+ base >= 4.7 && < 4.13
70 , bytestring >= 0.10.4.0 && < 0.11
71 , bytestring >= 0.10.4.0 && < 0.11
71− , containers >= 0.5.5.1 && < 0.6
72+ , containers >= 0.5.5.1 && < 0.7
72 , mtl >= 2.1 && < 2.3
73 , mtl >= 2.1 && < 2.3
73 , text >= 1.2.3.0 && < 1.3
74 , text >= 1.2.3.0 && < 1.3
74 , transformers >= 0.3.0.0 && < 0.6
75 , transformers >= 0.3.0.0 && < 0.6
servant/servant.cabal+2−1
@@ -23,6 +23,7 @@ tested-with:
23 GHC==8.0.2
23 GHC==8.0.2
24 GHC==8.2.2
24 GHC==8.2.2
25 GHC==8.4.3
25 GHC==8.4.3
26+ GHC==8.6.1
26extra-source-files:
27extra-source-files:
27 include/*.h
28 include/*.h
28 CHANGELOG.md
29 CHANGELOG.md
@@ -75,7 +76,7 @@ library
75 --
76 --
76 -- note: mtl lower bound is so low because of GHC-7.8
77 -- note: mtl lower bound is so low because of GHC-7.8
77 build-depends:
78 build-depends:
78− base >= 4.7 && < 4.12
79+ base >= 4.7 && < 4.13
79 , bytestring >= 0.10.4.0 && < 0.11
80 , bytestring >= 0.10.4.0 && < 0.11
80 , mtl >= 2.1 && < 2.3
81 , mtl >= 2.1 && < 2.3
81 , text >= 1.2.3.0 && < 1.3
82 , text >= 1.2.3.0 && < 1.3