git.iko.soy/typeable/servant
on 4cc4641 help sign in
b3279d9
swap
16 ahead, 437 behind
35 files changed+356−183
since splitsnapshots
unifiedsplit
.travis.yml+191−118 cabal.haskell-ci+9−1 cabal.project+18−2 doc/cookbook/basic-auth/basic-auth.cabal+1−1 doc/cookbook/basic-streaming/basic-streaming.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+1−1 doc/cookbook/sentry/sentry.cabal+1−1 doc/cookbook/structuring-apis/structuring-apis.cabal+1−1 doc/cookbook/testing/testing.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+1−1 servant-client-core/servant-client-core.cabal+5−3 servant-client-ghcjs/servant-client-ghcjs.cabal+1−1 servant-client/servant-client.cabal+6−4 servant-conduit/servant-conduit.cabal+2−2 servant-docs/servant-docs.cabal+5−4 servant-foreign/servant-foreign.cabal+2−1 servant-http-streams/servant-http-streams.cabal+5−4 servant-machines/servant-machines.cabal+4−4 servant-pipes/servant-pipes.cabal+2−2 servant-server/CHANGELOG.md+6 servant-server/servant-server.cabal+9−8 servant/CHANGELOG.md+15 servant/servant.cabal+9−7 servant/src/Servant/Types/SourceT.hs+32 servant/test/Servant/API/ContentTypesSpec.hs+18−5
.travis.yml+191−118
@@ -4,23 +4,21 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.2.1
7+# version: 0.3.20190730
88#
99language: c
1010dist: xenial
11−
1211git:
13− submodules: false # whether to recursively clone submodules
14−
12+ # whether to recursively clone submodules
13+ submodules: false
1514branches:
1615 only:
1716 - master
18−
17+ - release-0.16
1918cache:
2019 directories:
2120 - $HOME/.cabal/packages
2221 - $HOME/.cabal/store
23−
2422before_cache:
2523 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2624 # remove files that are regenerated by 'cabal update'
@@ -29,79 +27,137 @@ before_cache:
2927 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
3028 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
3129 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
32−
3330 - rm -rfv $CABALHOME/packages/head.hackage
34−
3531matrix:
3632 include:
37− - compiler: "ghc-8.6.4"
38− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.4], sources: [hvr-ghc]}}
39− - compiler: "ghc-8.4.4"
40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
41− - compiler: "ghc-8.2.2"
42− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
43− - compiler: "ghc-8.0.2"
44− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
45−
33+ - compiler: ghc-8.8.1
34+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
35+ env: HEADHACKAGE=true
36+ - compiler: ghc-8.6.5
37+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
38+ - compiler: ghc-8.4.4
39+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
40+ - compiler: ghc-8.2.2
41+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
42+ - compiler: ghc-8.0.2
43+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
44+ allow_failures:
45+ - compiler: ghc-8.8.1
4646before_install:
47− - HC=/opt/ghc/bin/${CC}
48− - HCPKG=${HC/ghc/ghc-pkg}
47+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
48+ - HCPKG="$HC-pkg"
4949 - unset CC
5050 - CABAL=/opt/ghc/bin/cabal
5151 - CABALHOME=$HOME/.cabal
5252 - export PATH="$CABALHOME/bin:$PATH"
53− - ROOTDIR=$(pwd)
53+ - TOP=$(pwd)
5454 - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
5555 - echo $HCNUMVER
56−
56+ - CABAL="$CABAL -vnormal+nowrap+markoutput"
57+ - set -o pipefail
58+ - |
59+ echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
60+ echo 'BEGIN { state = "output"; }' >> .colorful.awk
61+ echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
62+ echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
63+ echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
64+ echo ' if (state == "cabal") {' >> .colorful.awk
65+ echo ' print blue($0)' >> .colorful.awk
66+ echo ' } else {' >> .colorful.awk
67+ echo ' print $0' >> .colorful.awk
68+ echo ' }' >> .colorful.awk
69+ echo '}' >> .colorful.awk
70+ - cat .colorful.awk
71+ - |
72+ color_cabal_output () {
73+ awk -f $TOP/.colorful.awk
74+ }
75+ - echo text | color_cabal_output
5776install:
5877 - ${CABAL} --version
5978 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
6079 - TEST=--enable-tests
6180 - BENCH=--enable-benchmarks
62− - GHCHEAD=${GHCHEAD-false}
63− - travis_retry ${CABAL} update -v
64− - sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config
65− - rm -fv cabal.project cabal.project.local
66− - "sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' $CABALHOME/config"
67− - grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
68− - rm -f cabal.project
81+ - HEADHACKAGE=${HEADHACKAGE-false}
82+ - rm -f $CABALHOME/config
83+ - |
84+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
85+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
86+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
87+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
88+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
89+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
90+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
91+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
92+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
93+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
94+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
95+ echo "install-dirs user" >> $CABALHOME/config
96+ echo " prefix: $CABALHOME" >> $CABALHOME/config
97+ echo "repository hackage.haskell.org" >> $CABALHOME/config
98+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
99+ - |
100+ if $HEADHACKAGE; then
101+ echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
102+ echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
103+ echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
104+ echo " secure: True" >> $CABALHOME/config
105+ echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
106+ echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
107+ echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
108+ echo " key-threshold: 3" >> $CABALHOME/config
109+ fi
110+ - |
111+ echo "program-default-options" >> $CABALHOME/config
112+ echo " ghc-options: -j2" >> $CABALHOME/config
113+ - cat $CABALHOME/config
114+ - rm -fv cabal.project cabal.project.local cabal.project.freeze
115+ - travis_retry ${CABAL} v2-update -v
116+ # Generate cabal.project
117+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
69118 - touch cabal.project
70− - "printf 'packages: \"servant\"\\n' >> cabal.project"
71− - "printf 'packages: \"servant-client\"\\n' >> cabal.project"
72− - "printf 'packages: \"servant-client-core\"\\n' >> cabal.project"
73− - "printf 'packages: \"servant-http-streams\"\\n' >> cabal.project"
74− - "printf 'packages: \"servant-docs\"\\n' >> cabal.project"
75− - "printf 'packages: \"servant-foreign\"\\n' >> cabal.project"
76− - "printf 'packages: \"servant-server\"\\n' >> cabal.project"
77− - "printf 'packages: \"doc/tutorial\"\\n' >> cabal.project"
78− - "printf 'packages: \"servant-machines\"\\n' >> cabal.project"
79− - "printf 'packages: \"servant-conduit\"\\n' >> cabal.project"
80− - "printf 'packages: \"servant-pipes\"\\n' >> cabal.project"
81− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/basic-auth\"\\n' >> cabal.project ; fi"
82− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/curl-mock\"\\n' >> cabal.project ; fi"
83− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/basic-streaming\"\\n' >> cabal.project ; fi"
84− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/db-postgres-pool\"\\n' >> cabal.project ; fi"
85− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/db-sqlite-simple\"\\n' >> cabal.project ; fi"
86− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/file-upload\"\\n' >> cabal.project ; fi"
87− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/generic\"\\n' >> cabal.project ; fi"
88− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/https\"\\n' >> cabal.project ; fi"
89− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/pagination\"\\n' >> cabal.project ; fi"
90− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/testing\"\\n' >> cabal.project ; fi"
91− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/structuring-apis\"\\n' >> cabal.project ; fi"
92− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/using-custom-monad\"\\n' >> cabal.project ; fi"
93− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/using-free-client\"\\n' >> cabal.project ; fi"
94− - "echo 'constraints: foundation >=0.0.14' >> cabal.project"
95− - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"
96− - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"
97− - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"
98− - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"
99− - "echo 'allow-newer: servant-quickcheck:hspec' >> cabal.project"
100− - "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project"
101− - "echo 'optimization: False' >> cabal.project "
102− - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
103− - touch cabal.project.local
104− - "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-machines|servant-pipes|servant-server|tutorial)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
119+ - |
120+ echo 'packages: "servant"' >> cabal.project
121+ echo 'packages: "servant-client"' >> cabal.project
122+ echo 'packages: "servant-client-core"' >> cabal.project
123+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-http-streams"' >> cabal.project ; fi
124+ echo 'packages: "servant-docs"' >> cabal.project
125+ echo 'packages: "servant-foreign"' >> cabal.project
126+ echo 'packages: "servant-server"' >> cabal.project
127+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/tutorial"' >> cabal.project ; fi
128+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-machines"' >> cabal.project ; fi
129+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-conduit"' >> cabal.project ; fi
130+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-pipes"' >> cabal.project ; fi
131+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/basic-auth"' >> cabal.project ; fi
132+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/curl-mock"' >> cabal.project ; fi
133+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/basic-streaming"' >> cabal.project ; fi
134+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/db-postgres-pool"' >> cabal.project ; fi
135+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/db-sqlite-simple"' >> cabal.project ; fi
136+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/file-upload"' >> cabal.project ; fi
137+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/generic"' >> cabal.project ; fi
138+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/https"' >> cabal.project ; fi
139+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/pagination"' >> cabal.project ; fi
140+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/testing"' >> cabal.project ; fi
141+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/structuring-apis"' >> cabal.project ; fi
142+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi
143+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-free-client"' >> cabal.project ; fi
144+ - |
145+ echo "constraints: foundation >=0.0.14" >> cabal.project
146+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
147+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project
148+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
149+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
150+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
151+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
152+ echo "allow-newer: servant-quickcheck:warp" >> cabal.project
153+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
154+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
155+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
156+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
157+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
158+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
159+ echo "optimization: False" >> cabal.project
160+ - "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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
105161 - cat cabal.project || true
106162 - cat cabal.project.local || true
107163 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
@@ -128,72 +184,89 @@ install:
128184 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
129185 - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi
130186 - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi
131− - rm -f cabal.project.freeze
132− - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-http-streams"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "servant-machines"/dist "servant-conduit"/dist "servant-pipes"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/curl-mock"/dist "doc/cookbook/basic-streaming"/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/pagination"/dist "doc/cookbook/testing"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist
133− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
134−
135−# Here starts the actual work to be performed for the package under test;
136−# any command which exits with a non-zero exit code causes the build to fail.
187+ - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
188+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
189+ - rm cabal.project.freeze
137190script:
138− # test that source-distributions can be generated
139− - echo Packaging... && echo -en 'travis_fold:start:sdist\\r'
140− - ${CABAL} new-sdist all
191+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
192+ # Packaging...
193+ - echo 'Packaging...' && echo -en 'travis_fold:start:sdist\\r'
194+ - ${CABAL} v2-sdist all | color_cabal_output
141195 - echo -en 'travis_fold:end:sdist\\r'
142− - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
196+ # Unpacking...
197+ - echo 'Unpacking...' && echo -en 'travis_fold:start:unpack\\r'
143198 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
144199 - cd ${DISTDIR} || false
145200 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
146− - rm -f cabal.project
201+ # Generate cabal.project
202+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
147203 - touch cabal.project
148− - "printf 'packages: \"servant-*/*.cabal\"\\n' >> cabal.project"
149− - "printf 'packages: \"servant-client-*/*.cabal\"\\n' >> cabal.project"
150− - "printf 'packages: \"servant-client-core-*/*.cabal\"\\n' >> cabal.project"
151− - "printf 'packages: \"servant-http-streams-*/*.cabal\"\\n' >> cabal.project"
152− - "printf 'packages: \"servant-docs-*/*.cabal\"\\n' >> cabal.project"
153− - "printf 'packages: \"servant-foreign-*/*.cabal\"\\n' >> cabal.project"
154− - "printf 'packages: \"servant-server-*/*.cabal\"\\n' >> cabal.project"
155− - "printf 'packages: \"tutorial-*/*.cabal\"\\n' >> cabal.project"
156− - "printf 'packages: \"servant-machines-*/*.cabal\"\\n' >> cabal.project"
157− - "printf 'packages: \"servant-conduit-*/*.cabal\"\\n' >> cabal.project"
158− - "printf 'packages: \"servant-pipes-*/*.cabal\"\\n' >> cabal.project"
159− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-basic-auth-*/*.cabal\"\\n' >> cabal.project ; fi"
160− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-curl-mock-*/*.cabal\"\\n' >> cabal.project ; fi"
161− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-basic-streaming-*/*.cabal\"\\n' >> cabal.project ; fi"
162− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-db-postgres-pool-*/*.cabal\"\\n' >> cabal.project ; fi"
163− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-db-sqlite-simple-*/*.cabal\"\\n' >> cabal.project ; fi"
164− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-file-upload-*/*.cabal\"\\n' >> cabal.project ; fi"
165− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-generic-*/*.cabal\"\\n' >> cabal.project ; fi"
166− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-https-*/*.cabal\"\\n' >> cabal.project ; fi"
167− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-pagination-*/*.cabal\"\\n' >> cabal.project ; fi"
168− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-testing-*/*.cabal\"\\n' >> cabal.project ; fi"
169− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-structuring-apis-*/*.cabal\"\\n' >> cabal.project ; fi"
170− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-using-custom-monad-*/*.cabal\"\\n' >> cabal.project ; fi"
171− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-using-free-client-*/*.cabal\"\\n' >> cabal.project ; fi"
172− - "echo 'constraints: foundation >=0.0.14' >> cabal.project"
173− - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"
174− - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"
175− - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"
176− - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"
177− - "echo 'allow-newer: servant-quickcheck:hspec' >> cabal.project"
178− - "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project"
179− - "echo 'optimization: False' >> cabal.project "
180− - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
181− - touch cabal.project.local
182− - "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-machines|servant-pipes|servant-server|tutorial)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
204+ - |
205+ echo 'packages: "servant-*/*.cabal"' >> cabal.project
206+ echo 'packages: "servant-client-*/*.cabal"' >> cabal.project
207+ echo 'packages: "servant-client-core-*/*.cabal"' >> cabal.project
208+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-http-streams-*/*.cabal"' >> cabal.project ; fi
209+ echo 'packages: "servant-docs-*/*.cabal"' >> cabal.project
210+ echo 'packages: "servant-foreign-*/*.cabal"' >> cabal.project
211+ echo 'packages: "servant-server-*/*.cabal"' >> cabal.project
212+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "tutorial-*/*.cabal"' >> cabal.project ; fi
213+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-machines-*/*.cabal"' >> cabal.project ; fi
214+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-conduit-*/*.cabal"' >> cabal.project ; fi
215+ if [ $HCNUMVER -eq 80002 ] || [ $HCNUMVER -eq 80202 ] || [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-pipes-*/*.cabal"' >> cabal.project ; fi
216+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-basic-auth-*/*.cabal"' >> cabal.project ; fi
217+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-curl-mock-*/*.cabal"' >> cabal.project ; fi
218+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-basic-streaming-*/*.cabal"' >> cabal.project ; fi
219+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-db-postgres-pool-*/*.cabal"' >> cabal.project ; fi
220+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-db-sqlite-simple-*/*.cabal"' >> cabal.project ; fi
221+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-file-upload-*/*.cabal"' >> cabal.project ; fi
222+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-generic-*/*.cabal"' >> cabal.project ; fi
223+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-https-*/*.cabal"' >> cabal.project ; fi
224+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-pagination-*/*.cabal"' >> cabal.project ; fi
225+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-testing-*/*.cabal"' >> cabal.project ; fi
226+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-structuring-apis-*/*.cabal"' >> cabal.project ; fi
227+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi
228+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi
229+ - |
230+ echo "constraints: foundation >=0.0.14" >> cabal.project
231+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
232+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project
233+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
234+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
235+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
236+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
237+ echo "allow-newer: servant-quickcheck:warp" >> cabal.project
238+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
239+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
240+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
241+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
242+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
243+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
244+ echo "optimization: False" >> cabal.project
245+ - "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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
183246 - cat cabal.project || true
184247 - cat cabal.project.local || true
185248 - echo -en 'travis_fold:end:unpack\\r'
186−
187− - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r'
249+ # Building with tests and benchmarks...
250+ - echo 'Building with tests and benchmarks...' && echo -en 'travis_fold:start:build-everything\\r'
188251 # build & run tests, build benchmarks
189− - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
252+ - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
190253 - echo -en 'travis_fold:end:build-everything\\r'
191− - if [ "x$TEST" = "x--enable-tests" ]; then ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all; fi
192−
193− - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'
194− # haddock
195− - ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all
196−
254+ # Testing...
255+ - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
256+ # haddock...
257+ - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'
258+ - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
197259 - echo -en 'travis_fold:end:haddock\\r'
260+ # Constraint sets
261+ - rm -rf cabal.project.local
262+ # Constraint set http-media-0.8
263+ - echo 'Constraint set http-media-0.8' && echo -en 'travis_fold:start:constraint-sets-http-media-0.8\\r'
264+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='http-media ==0.8.*' all | color_cabal_output
265+ - echo -en 'travis_fold:end:constraint-sets-http-media-0.8\\r'
266+ # Constraint set http-media-0.7
267+ - echo 'Constraint set http-media-0.7' && echo -en 'travis_fold:start:constraint-sets-http-media-0.7\\r'
268+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='http-media ==0.7.*' all | color_cabal_output
269+ - echo -en 'travis_fold:end:constraint-sets-http-media-0.7\\r'
270+
198271# REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"]
199272# EOF
cabal.haskell-ci+9−1
@@ -1,5 +1,5 @@
11folds: all-but-test
2−branches: master
2+branches: master release-0.16
33jobs-selection: any
44
55-- We have inplace packages (servant-js) so we skip installing dependencies in a separate step
@@ -14,3 +14,11 @@ cabal-check: False
1414
1515-- ghc-options: -j2
1616jobs: :2
17+
18+constraint-set http-media-0.8
19+ constraints: http-media ==0.8.*
20+
21+constraint-set http-media-0.7
22+ constraints: http-media ==0.7.*
23+
24+head-hackage: >= 8.8
cabal.project+18−2
@@ -48,6 +48,22 @@ allow-newer:
4848
4949-- servant-quickcheck
5050allow-newer:
51− servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
51+ servant-quickcheck:servant,
52+ servant-quickcheck:servant-client,
53+ servant-quickcheck:servant-server,
5254 servant-quickcheck:hspec,
53− servant-quickcheck:http-client
55+ servant-quickcheck:http-client,
56+ servant-quickcheck:warp
57+
58+-- constraints: semigroups ^>=0.19
59+-- constraints: hashable ^>=1.3
60+-- constraints: network ^>=3.1
61+-- constraints: machines ^>=0.7
62+-- constraints: http-media ^>=0.8
63+
64+allow-newer: vault-0.3.1.2:hashable
65+allow-newer: psqueues-0.2.7.1:hashable
66+allow-newer: sqlite-simple-0.4.16.0:semigroups
67+allow-newer: direct-sqlite-2.3.24:semigroups
68+allow-newer: io-streams-1.5.1.0:network
69+allow-newer: openssl-streams-1.2.2.0:network
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
1212
1313executable cookbook-basic-auth
1414 main-is: BasicAuth.lhs
doc/cookbook/basic-streaming/basic-streaming.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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
1212
1313executable cookbook-basic-streaming
1414 main-is: Streaming.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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
14+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
14+tested-with: GHC==8.4.4, GHC==8.6.5
1515
1616executable cookbook-jwt-and-basic-auth
1717 main-is: JWTAndBasicAuth.lhs
doc/cookbook/pagination/pagination.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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
1212
1313executable cookbook-pagination
1414 main-is: Pagination.lhs
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
1212
1313executable cookbook-structuring-apis
1414 main-is: StructuringApis.lhs
doc/cookbook/testing/testing.cabal+1−1
@@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1010category: Servant
1111build-type: Simple
1212cabal-version: >=1.10
13−tested-with: GHC==8.4.4, GHC==8.6.4
13+tested-with: GHC==8.4.4, GHC==8.6.5
1414
1515executable cookbook-testing
1616 main-is: Testing.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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
1212
1313executable cookbook-using-free-client
1414 main-is: UsingFreeClient.lhs
doc/tutorial/tutorial.cabal+1−1
@@ -16,7 +16,7 @@ tested-with:
1616 GHC==8.0.2
1717 GHC==8.2.2
1818 GHC==8.4.4
19− GHC==8.6.4
19+ GHC==8.6.5
2020extra-source-files:
2121 static/index.html
2222 static/ui.js
servant-client-core/servant-client-core.cabal+5−3
@@ -1,6 +1,7 @@
11cabal-version: >=1.10
22name: servant-client-core
33version: 0.16
4+x-revision: 1
45
56synopsis: Core functionality and class for client function generation for servant APIs
67category: Servant, Web
@@ -20,7 +21,8 @@ tested-with:
2021 GHC ==8.0.2
2122 || ==8.2.2
2223 || ==8.4.4
23− || ==8.6.4
24+ || ==8.6.5
25+ || ==8.8.1
2426
2527extra-source-files:
2628 CHANGELOG.md
@@ -77,7 +79,7 @@ library
7779 , base64-bytestring >= 1.0.0.1 && < 1.1
7880 , exceptions >= 0.10.0 && < 0.11
7981 , free >= 5.1 && < 5.2
80− , http-media >= 0.7.1.3 && < 0.8
82+ , http-media >= 0.7.1.3 && < 0.9
8183 , http-types >= 0.12.2 && < 0.13
8284 , network-uri >= 2.6.1.0 && < 2.7
8385 , safe >= 0.3.17 && < 0.4
@@ -105,7 +107,7 @@ test-suite spec
105107 build-depends:
106108 deepseq >= 1.4.2.0 && < 1.5
107109 , hspec >= 2.6.0 && < 2.8
108− , QuickCheck >= 2.12.6.1 && < 2.13
110+ , QuickCheck >= 2.12.6.1 && < 2.14
109111
110112 build-tool-depends:
111113 hspec-discover:hspec-discover >= 2.6.0 && <2.8
servant-client-ghcjs/servant-client-ghcjs.cabal+1−1
@@ -45,7 +45,7 @@ library
4545 , exceptions >=0.8 && <0.11
4646 , ghcjs-base >=0.2.0.0 && <0.3.0.0
4747 , ghcjs-prim >=0.1.0.0 && <0.2.0.0
48− , http-media >=0.6.2 && <0.8
48+ , http-media >=0.6.2 && <0.9
4949 , http-types >=0.12 && <0.13
5050 , monad-control >=1.0.0.4 && <1.1
5151 , mtl >=2.2.2 && <2.3
servant-client/servant-client.cabal+6−4
@@ -1,6 +1,7 @@
11cabal-version: >=1.10
22name: servant-client
33version: 0.16
4+x-revision: 2
45
56synopsis: Automatic derivation of querying functions for servant
67category: Servant, Web
@@ -24,7 +25,8 @@ tested-with:
2425 GHC ==8.0.2
2526 || ==8.2.2
2627 || ==8.4.4
27− || ==8.6.4
28+ || ==8.6.5
29+ || ==8.8.1
2830
2931extra-source-files:
3032 CHANGELOG.md
@@ -69,7 +71,7 @@ library
6971 build-depends:
7072 base-compat >= 0.10.5 && < 0.11
7173 , http-client >= 0.5.13.1 && < 0.7
72− , http-media >= 0.7.1.3 && < 0.8
74+ , http-media >= 0.7.1.3 && < 0.9
7375 , http-types >= 0.12.2 && < 0.13
7476 , exceptions >= 0.10.0 && < 0.11
7577 , kan-extensions >= 5.2 && < 5.3
@@ -117,8 +119,8 @@ test-suite spec
117119 entropy >= 0.4.1.3 && < 0.5
118120 , hspec >= 2.6.0 && < 2.8
119121 , HUnit >= 1.6.0.0 && < 1.7
120− , network >= 2.8.0.0 && < 3.1
121− , QuickCheck >= 2.12.6.1 && < 2.13
122+ , network >= 2.8.0.0 && < 3.2
123+ , QuickCheck >= 2.12.6.1 && < 2.14
122124 , servant == 0.16.*
123125 , servant-server == 0.16.*
124126 , tdigest >= 0.2 && < 0.3
servant-conduit/servant-conduit.cabal+2−2
@@ -21,7 +21,7 @@ tested-with:
2121 GHC ==8.0.2
2222 || ==8.2.2
2323 || ==8.4.4
24− || ==8.6.4
24+ || ==8.6.5
2525
2626extra-source-files:
2727 CHANGELOG.md
@@ -62,6 +62,6 @@ test-suite example
6262 , servant-server >=0.15 && <0.17
6363 , servant-client >=0.15 && <0.17
6464 , wai >=3.2.1.2 && <3.3
65− , warp >=3.2.25 && <3.3
65+ , warp >=3.2.25 && <3.4
6666 , http-client
6767 default-language: Haskell2010
servant-docs/servant-docs.cabal+5−4
@@ -1,7 +1,7 @@
11cabal-version: >=1.10
22name: servant-docs
33version: 0.11.3
4−x-revision: 1
4+x-revision: 3
55
66synopsis: generate API docs for your servant webservice
77category: Servant, Web
@@ -24,7 +24,8 @@ tested-with:
2424 GHC ==8.0.2
2525 || ==8.2.2
2626 || ==8.4.4
27− || ==8.6.4
27+ || ==8.6.5
28+ || ==8.8.1
2829
2930extra-source-files:
3031 CHANGELOG.md
@@ -62,8 +63,8 @@ library
6263 , base-compat >= 0.10.5 && < 0.11
6364 , case-insensitive >= 1.2.0.11 && < 1.3
6465 , control-monad-omega >= 0.3.1 && < 0.4
65− , hashable >= 1.2.7.0 && < 1.3
66− , http-media >= 0.7.1.3 && < 0.8
66+ , hashable >= 1.2.7.0 && < 1.4
67+ , http-media >= 0.7.1.3 && < 0.9
6768 , http-types >= 0.12.2 && < 0.13
6869 , lens >= 4.17 && < 4.18
6970 , string-conversions >= 0.4.0.1 && < 0.5
servant-foreign/servant-foreign.cabal+2−1
@@ -26,7 +26,8 @@ tested-with:
2626 GHC ==8.0.2
2727 || ==8.2.2
2828 || ==8.4.4
29− || ==8.6.4
29+ || ==8.6.5
30+ || ==8.8.1
3031
3132extra-source-files:
3233 CHANGELOG.md
servant-http-streams/servant-http-streams.cabal+5−4
@@ -1,6 +1,7 @@
11cabal-version: >=1.10
22name: servant-http-streams
33version: 0.16
4+x-revision: 2
45
56synopsis: Automatic derivation of querying functions for servant
67category: Servant, Web
@@ -24,7 +25,7 @@ tested-with:
2425 GHC ==8.0.2
2526 || ==8.2.2
2627 || ==8.4.4
27− || ==8.6.4
28+ || ==8.6.5
2829
2930extra-source-files:
3031 CHANGELOG.md
@@ -67,7 +68,7 @@ library
6768 base-compat >= 0.10.5 && < 0.11
6869 , case-insensitive
6970 , http-streams >= 0.8.6.1 && < 0.9
70− , http-media >= 0.7.1.3 && < 0.8
71+ , http-media >= 0.7.1.3 && < 0.9
7172 , io-streams >= 1.5.0.1 && < 1.6
7273 , http-types >= 0.12.2 && < 0.13
7374 , http-common >= 0.8.2.0 && < 0.9
@@ -118,8 +119,8 @@ test-suite spec
118119 entropy >= 0.4.1.3 && < 0.5
119120 , hspec >= 2.6.0 && < 2.8
120121 , HUnit >= 1.6.0.0 && < 1.7
121− , network >= 2.8.0.0 && < 3.1
122− , QuickCheck >= 2.12.6.1 && < 2.13
122+ , network >= 2.8.0.0 && < 3.2
123+ , QuickCheck >= 2.12.6.1 && < 2.14
123124 , servant == 0.16.*
124125 , servant-server == 0.16.*
125126 , tdigest >= 0.2 && < 0.3
servant-machines/servant-machines.cabal+4−4
@@ -1,7 +1,7 @@
11cabal-version: >=1.10
22name: servant-machines
33version: 0.15
4−x-revision: 1
4+x-revision: 2
55
66synopsis: Servant Stream support for machines
77category: Servant, Web, Enumerator
@@ -21,7 +21,7 @@ tested-with:
2121 GHC ==8.0.2
2222 || ==8.2.2
2323 || ==8.4.4
24− || ==8.6.4
24+ || ==8.6.5
2525
2626extra-source-files:
2727 CHANGELOG.md
@@ -35,7 +35,7 @@ library
3535 build-depends:
3636 base >=4.9 && <5
3737 , bytestring >=0.10.8.1 && <0.11
38− , machines >=0.6.4 && <0.7
38+ , machines >=0.6.4 && <0.8
3939 , mtl >=2.2.2 && <2.3
4040 , servant >=0.15 && <0.17
4141 hs-source-dirs: src
@@ -59,6 +59,6 @@ test-suite example
5959 , servant-server >=0.15 && <0.17
6060 , servant-client >=0.15 && <0.17
6161 , wai >=3.2.1.2 && <3.3
62− , warp >=3.2.25 && <3.3
62+ , warp >=3.2.25 && <3.4
6363 , http-client
6464 default-language: Haskell2010
servant-pipes/servant-pipes.cabal+2−2
@@ -21,7 +21,7 @@ tested-with:
2121 GHC ==8.0.2
2222 || ==8.2.2
2323 || ==8.4.4
24− || ==8.6.4
24+ || ==8.6.5
2525
2626extra-source-files:
2727 CHANGELOG.md
@@ -63,6 +63,6 @@ test-suite example
6363 , servant-server >=0.15 && <0.17
6464 , servant-client >=0.15 && <0.17
6565 , wai >=3.2.1.2 && <3.3
66− , warp >=3.2.25 && <3.3
66+ , warp >=3.2.25 && <3.4
6767 , http-client
6868 default-language: Haskell2010
servant-server/CHANGELOG.md+6
@@ -1,6 +1,12 @@
11[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-server/CHANGELOG.md)
22[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33
4+0.16.1
5+------
6+
7+* Use `http-api-data-0.4.1` (a part of its API is re-exported)
8+ [#1181](https://github.com/haskell-servant/servant/pull/1181)
9+
4100.16
511----
612
servant-server/servant-server.cabal+9−8
@@ -1,6 +1,6 @@
11cabal-version: >=1.10
22name: servant-server
3−version: 0.16
3+version: 0.16.2
44
55synopsis: A family of combinators for defining webservices APIs and serving them
66category: Servant, Web
@@ -27,7 +27,8 @@ tested-with:
2727 GHC ==8.0.2
2828 || ==8.2.2
2929 || ==8.4.4
30− || ==8.6.4
30+ || ==8.6.5
31+ || ==8.8.1
3132
3233extra-source-files:
3334 CHANGELOG.md
@@ -79,8 +80,8 @@ library
7980 -- Servant dependencies
8081 -- strict dependency as we re-export 'servant' things.
8182 build-depends:
82− servant >= 0.16 && < 0.17.1
83− , http-api-data >= 0.4 && < 0.4.1
83+ servant >= 0.16.2 && < 0.16.3
84+ , http-api-data >= 0.4.1 && < 0.4.2
8485
8586 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
8687 -- Here can be exceptions if we really need features from the newer versions.
@@ -88,11 +89,11 @@ library
8889 base-compat >= 0.10.5 && < 0.11
8990 , base64-bytestring >= 1.0.0.1 && < 1.1
9091 , exceptions >= 0.10.0 && < 0.11
91− , http-media >= 0.7.1.3 && < 0.8
92+ , http-media >= 0.7.1.3 && < 0.9
9293 , http-types >= 0.12.2 && < 0.13
9394 , network-uri >= 2.6.1.0 && < 2.8
9495 , monad-control >= 1.0.2.3 && < 1.1
95− , network >= 2.8 && < 3.1
96+ , network >= 2.8 && < 3.2
9697 , string-conversions >= 0.4.0.1 && < 0.5
9798 , resourcet >= 1.2.2 && < 1.3
9899 , tagged >= 0.8.6 && < 0.9
@@ -120,7 +121,7 @@ executable greet
120121
121122 build-depends:
122123 aeson >= 1.4.1.0 && < 1.5
123− , warp >= 3.2.25 && < 3.3
124+ , warp >= 3.2.25 && < 3.4
124125
125126test-suite spec
126127 type: exitcode-stdio-1.0
@@ -165,7 +166,7 @@ test-suite spec
165166 , directory >= 1.3.0.0 && < 1.4
166167 , hspec >= 2.6.0 && < 2.8
167168 , hspec-wai >= 0.9.0 && < 0.10
168− , QuickCheck >= 2.12.6.1 && < 2.13
169+ , QuickCheck >= 2.12.6.1 && < 2.14
169170 , should-not-typecheck >= 2.1.0 && < 2.2
170171 , temporary >= 1.3 && < 1.4
171172 , wai-extra >= 3.0.24.3 && < 3.1
servant/CHANGELOG.md+15
@@ -1,5 +1,20 @@
11[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
22
3+0.16.1
4+------
5+
6+* Add `Semigroup` and `Monoid` `SourceT` instances
7+ [#1158](https://github.com/haskell-servant/servant/pull/1158)
8+ [#1159](https://github.com/haskell-servant/servant/pull/1159)
9+* Use `http-api-data-0.4.1`
10+ [#1181](https://github.com/haskell-servant/servant/pull/1181)
11+* Allow newer dependencies
12+
13+0.16.0.1
14+--------
15+
16+- Make tests work with `http-media-0.8`
17+
3180.16
419----
520
servant/servant.cabal+9−7
@@ -1,6 +1,6 @@
11cabal-version: >=1.10
22name: servant
3−version: 0.16
3+version: 0.16.2
44
55synopsis: A family of combinators for defining webservices APIs
66category: Servant, Web
@@ -24,7 +24,8 @@ tested-with:
2424 GHC ==8.0.2
2525 || ==8.2.2
2626 || ==8.4.4
27− || ==8.6.4
27+ || ==8.6.5
28+ || ==8.8.1
2829
2930extra-source-files:
3031 CHANGELOG.md
@@ -98,8 +99,8 @@ library
9899 -- We depend (heavily) on the API of these packages:
99100 -- i.e. re-export, or allow using without direct dependency
100101 build-depends:
101− http-api-data >= 0.4 && < 0.4.1
102− , singleton-bool >= 0.1.4 && < 0.1.5
102+ http-api-data >= 0.4.1 && < 0.4.2
103+ , singleton-bool >= 0.1.5 && < 0.1.6
103104
104105 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
105106 -- Here can be exceptions if we really need features from the newer versions.
@@ -110,11 +111,11 @@ library
110111 , bifunctors >= 5.5.3 && < 5.6
111112 , case-insensitive >= 1.2.0.11 && < 1.3
112113 , deepseq >= 1.4.2.0 && < 1.5
113− , http-media >= 0.7.1.3 && < 0.8
114+ , http-media >= 0.7.1.3 && < 0.9
114115 , http-types >= 0.12.2 && < 0.13
115116 , mmorph >= 1.1.2 && < 1.2
116117 , network-uri >= 2.6.1.0 && < 2.7
117− , QuickCheck >= 2.12.6.1 && <2.13
118+ , QuickCheck >= 2.12.6.1 && < 2.14
118119 , string-conversions >= 0.4.0.1 && < 0.5
119120 , tagged >= 0.8.6 && < 0.9
120121 , vault >= 0.3.1.2 && < 0.4
@@ -161,6 +162,7 @@ test-suite spec
161162 , base-compat
162163 , aeson
163164 , bytestring
165+ , http-media
164166 , mtl
165167 , servant
166168 , string-conversions
@@ -170,7 +172,7 @@ test-suite spec
170172 -- Additonal dependencies
171173 build-depends:
172174 hspec >= 2.6.0 && < 2.8
173− , QuickCheck >= 2.12.6.1 && < 2.13
175+ , QuickCheck >= 2.12.6.1 && < 2.14
174176 , quickcheck-instances >= 0.3.19 && < 0.4
175177
176178 build-tool-depends:
servant/src/Servant/Types/SourceT.hs+32
@@ -89,6 +89,21 @@ instance MFunctor SourceT where
8989 hoist f (SourceT m) = SourceT $ \k -> k $
9090 Effect $ f $ fmap (hoist f) $ m return
9191
92+-- | >>> source "xy" <> source "z" :: SourceT Identity Char
93+-- fromStepT (Effect (Identity (Yield 'x' (Yield 'y' (Yield 'z' Stop)))))
94+--
95+instance Functor m => Semigroup (SourceT m a) where
96+ SourceT withL <> SourceT withR = SourceT $ \ret ->
97+ withL $ \l ->
98+ withR $ \r ->
99+ ret $ l <> r
100+
101+-- | >>> mempty :: SourceT Maybe Int
102+-- fromStepT (Effect (Just Stop))
103+instance Functor m => Monoid (SourceT m a) where
104+ mempty = fromStepT mempty
105+ mappend = (<>)
106+
92107-- | Doesn't generate 'Error' constructors. 'SourceT' doesn't shrink.
93108instance (QC.Arbitrary a, Monad m) => QC.Arbitrary (SourceT m a) where
94109 arbitrary = fromStepT <$> QC.arbitrary
@@ -150,6 +165,23 @@ instance MFunctor StepT where
150165 go (Yield x s) = Yield x (go s)
151166 go (Effect ms) = Effect (f (fmap go ms))
152167
168+instance Functor m => Semigroup (StepT m a) where
169+ Stop <> r = r
170+ Error err <> _ = Error err
171+ Skip s <> r = Skip (s <> r)
172+ Yield x s <> r = Yield x (s <> r)
173+ Effect ms <> r = Effect ((<> r) <$> ms)
174+
175+-- | >>> mempty :: StepT [] Int
176+-- Stop
177+--
178+-- >>> mempty :: StepT Identity Int
179+-- Stop
180+--
181+instance Functor m => Monoid (StepT m a) where
182+ mempty = Stop
183+ mappend = (<>)
184+
153185-- | Doesn't generate 'Error' constructors.
154186instance (QC.Arbitrary a, Monad m) => QC.Arbitrary (StepT m a) where
155187 arbitrary = QC.sized arb where
servant/test/Servant/API/ContentTypesSpec.hs+18−5
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE DataKinds #-}
23{-# LANGUAGE DeriveGeneric #-}
34{-# LANGUAGE MultiParamTypeClasses #-}
@@ -20,7 +21,7 @@ import Data.Either
2021import Data.Function
2122 (on)
2223import Data.List
23− (maximumBy)
24+ (sortBy)
2425import qualified Data.List.NonEmpty as NE
2526import Data.Maybe
2627 (fromJust, isJust, isNothing)
@@ -134,17 +135,29 @@ spec = describe "Servant.API.ContentTypes" $ do
134135 == Just ("application/json;charset=utf-8", encode x)
135136
136137 it "respects the Accept spec ordering" $ do
137− let highest a b c = maximumBy (compare `on` snd)
138+ let highest a b c = last $ sortBy (compare `on` snd)
139+-- when qualities are same, http-media-0.8 picks first; 0.7 last.
140+#if MIN_VERSION_http_media(0,8,0)
141+ [ ("text/plain;charset=utf-8", c)
142+ , ("application/json;charset=utf-8", b)
143+ , ("application/octet-stream", a)
144+ ]
145+#else
138146 [ ("application/octet-stream", a)
139147 , ("application/json;charset=utf-8", b)
140148 , ("text/plain;charset=utf-8", c)
141149 ]
150+#endif
142151 let acceptH a b c = addToAccept (Proxy :: Proxy OctetStream) a $
143− addToAccept (Proxy :: Proxy JSON) b $
144− addToAccept (Proxy :: Proxy PlainText ) c ""
152+ addToAccept (Proxy :: Proxy JSON) b $
153+ addToAccept (Proxy :: Proxy PlainText ) c $
154+ ""
145155 let val a b c i = handleAcceptH (Proxy :: Proxy '[OctetStream, JSON, PlainText])
146156 (acceptH a b c) (i :: Int)
147− property $ \a b c i -> fst (fromJust $ val a b c i) == fst (highest a b c)
157+ property $ \a b c i ->
158+ let acc = acceptH a b c
159+ in counterexample (show acc) $
160+ fst (fromJust $ val a b c i) === fst (highest a b c)
148161
149162 describe "handleCTypeH" $ do
150163