git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1172 from haskell-servant/http-media-0.8

Http media 0.8

commit269da4f7beb5622c0f599aa5d58e8c0ba7430355 authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 16 Apr 2019, 14:57 (8 years ago) parentad0228062fa0be
11 files changed+207−135
compare with master
unifiedsplit
.travis.yml+160−115 cabal.haskell-ci+7−1 cabal.project+2 servant-client-core/servant-client-core.cabal+3−2 servant-client-ghcjs/servant-client-ghcjs.cabal+1−1 servant-client/servant-client.cabal+3−2 servant-docs/servant-docs.cabal+2−2 servant-http-streams/servant-http-streams.cabal+3−2 servant-server/servant-server.cabal+3−2 servant/servant.cabal+5−3 servant/test/Servant/API/ContentTypesSpec.hs+18−5
.travis.yml+160−115
@@ -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.20190413
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,78 +27,113 @@ 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.6.4
34+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}
35+ - compiler: ghc-8.4.4
36+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
37+ - compiler: ghc-8.2.2
38+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
39+ - compiler: ghc-8.0.2
40+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
4641before_install:
47− - HC=/opt/ghc/bin/${CC}
48− - HCPKG=${HC/ghc/ghc-pkg}
42+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
43+ - HCPKG="$HC-pkg"
4944 - unset CC
5045 - CABAL=/opt/ghc/bin/cabal
5146 - CABALHOME=$HOME/.cabal
5247 - export PATH="$CABALHOME/bin:$PATH"
53− - ROOTDIR=$(pwd)
48+ - TOP=$(pwd)
5449 - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
5550 - echo $HCNUMVER
56−
51+ - CABAL="$CABAL -vnormal+nowrap+markoutput"
52+ - set -o pipefail
53+ - |
54+ echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
55+ echo 'BEGIN { state = "output"; }' >> .colorful.awk
56+ echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
57+ echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
58+ echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
59+ echo ' if (state == "cabal") {' >> .colorful.awk
60+ echo ' print blue($0)' >> .colorful.awk
61+ echo ' } else {' >> .colorful.awk
62+ echo ' print $0' >> .colorful.awk
63+ echo ' }' >> .colorful.awk
64+ echo '}' >> .colorful.awk
65+ - cat .colorful.awk
66+ - |
67+ color_cabal_output () {
68+ awk -f $TOP/.colorful.awk
69+ }
70+ - echo text | color_cabal_output
5771install:
5872 - ${CABAL} --version
5973 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
6074 - TEST=--enable-tests
6175 - BENCH=--enable-benchmarks
6276 - 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
77+ - rm -f $CABALHOME/config
78+ - |
79+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
80+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
81+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
82+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
83+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
84+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
85+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
86+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
87+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
88+ echo "install-dirs user" >> $CABALHOME/config
89+ echo " prefix: $CABALHOME" >> $CABALHOME/config
90+ echo "repository hackage.haskell.org" >> $CABALHOME/config
91+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
92+ - |
93+ echo "program-default-options" >> $CABALHOME/config
94+ echo " ghc-options: -j2" >> $CABALHOME/config
95+ - cat $CABALHOME/config
96+ - rm -fv cabal.project cabal.project.local cabal.project.freeze
97+ - travis_retry ${CABAL} v2-update -v
98+ # Generate cabal.project
99+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
69100 - 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
101+ - |
102+ echo 'packages: "servant"' >> cabal.project
103+ echo 'packages: "servant-client"' >> cabal.project
104+ echo 'packages: "servant-client-core"' >> cabal.project
105+ echo 'packages: "servant-http-streams"' >> cabal.project
106+ echo 'packages: "servant-docs"' >> cabal.project
107+ echo 'packages: "servant-foreign"' >> cabal.project
108+ echo 'packages: "servant-server"' >> cabal.project
109+ echo 'packages: "doc/tutorial"' >> cabal.project
110+ echo 'packages: "servant-machines"' >> cabal.project
111+ echo 'packages: "servant-conduit"' >> cabal.project
112+ echo 'packages: "servant-pipes"' >> cabal.project
113+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/basic-auth"' >> cabal.project ; fi
114+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/curl-mock"' >> cabal.project ; fi
115+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/basic-streaming"' >> cabal.project ; fi
116+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/db-postgres-pool"' >> cabal.project ; fi
117+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/db-sqlite-simple"' >> cabal.project ; fi
118+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/file-upload"' >> cabal.project ; fi
119+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/generic"' >> cabal.project ; fi
120+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/https"' >> cabal.project ; fi
121+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/pagination"' >> cabal.project ; fi
122+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/testing"' >> cabal.project ; fi
123+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/structuring-apis"' >> cabal.project ; fi
124+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi
125+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-free-client"' >> cabal.project ; fi
126+ - |
127+ echo "constraints: foundation >=0.0.14" >> cabal.project
128+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
129+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project
130+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
131+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
132+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
133+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
134+ echo "allow-newer: http-media" >> cabal.project
135+ echo "optimization: False" >> cabal.project
136+ echo "write-ghc-environment-files: always" >> cabal.project
104137 - "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"
105138 - cat cabal.project || true
106139 - cat cabal.project.local || true
@@ -128,72 +161,84 @@ install:
128161 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
129162 - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi
130163 - 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.
164+ - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
165+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
166+ - rm cabal.project.freeze
137167script:
138− # test that source-distributions can be generated
139− - echo Packaging... && echo -en 'travis_fold:start:sdist\\r'
140− - ${CABAL} new-sdist all
168+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
169+ # Packaging...
170+ - echo 'Packaging...' && echo -en 'travis_fold:start:sdist\\r'
171+ - ${CABAL} v2-sdist all | color_cabal_output
141172 - echo -en 'travis_fold:end:sdist\\r'
142− - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
173+ # Unpacking...
174+ - echo 'Unpacking...' && echo -en 'travis_fold:start:unpack\\r'
143175 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
144176 - cd ${DISTDIR} || false
145177 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
146− - rm -f cabal.project
178+ # Generate cabal.project
179+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
147180 - 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
181+ - |
182+ echo 'packages: "servant-*/*.cabal"' >> cabal.project
183+ echo 'packages: "servant-client-*/*.cabal"' >> cabal.project
184+ echo 'packages: "servant-client-core-*/*.cabal"' >> cabal.project
185+ echo 'packages: "servant-http-streams-*/*.cabal"' >> cabal.project
186+ echo 'packages: "servant-docs-*/*.cabal"' >> cabal.project
187+ echo 'packages: "servant-foreign-*/*.cabal"' >> cabal.project
188+ echo 'packages: "servant-server-*/*.cabal"' >> cabal.project
189+ echo 'packages: "tutorial-*/*.cabal"' >> cabal.project
190+ echo 'packages: "servant-machines-*/*.cabal"' >> cabal.project
191+ echo 'packages: "servant-conduit-*/*.cabal"' >> cabal.project
192+ echo 'packages: "servant-pipes-*/*.cabal"' >> cabal.project
193+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-basic-auth-*/*.cabal"' >> cabal.project ; fi
194+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-curl-mock-*/*.cabal"' >> cabal.project ; fi
195+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-basic-streaming-*/*.cabal"' >> cabal.project ; fi
196+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-db-postgres-pool-*/*.cabal"' >> cabal.project ; fi
197+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-db-sqlite-simple-*/*.cabal"' >> cabal.project ; fi
198+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-file-upload-*/*.cabal"' >> cabal.project ; fi
199+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-generic-*/*.cabal"' >> cabal.project ; fi
200+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-https-*/*.cabal"' >> cabal.project ; fi
201+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-pagination-*/*.cabal"' >> cabal.project ; fi
202+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-testing-*/*.cabal"' >> cabal.project ; fi
203+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-structuring-apis-*/*.cabal"' >> cabal.project ; fi
204+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi
205+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi
206+ - |
207+ echo "constraints: foundation >=0.0.14" >> cabal.project
208+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
209+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project
210+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
211+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
212+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
213+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
214+ echo "allow-newer: http-media" >> cabal.project
215+ echo "optimization: False" >> cabal.project
216+ echo "write-ghc-environment-files: always" >> cabal.project
182217 - "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"
183218 - cat cabal.project || true
184219 - cat cabal.project.local || true
185220 - echo -en 'travis_fold:end:unpack\\r'
186−
187− - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r'
221+ # Building with tests and benchmarks...
222+ - echo 'Building with tests and benchmarks...' && echo -en 'travis_fold:start:build-everything\\r'
188223 # build & run tests, build benchmarks
189− - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
224+ - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
190225 - 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−
226+ # Testing...
227+ - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
228+ # haddock...
229+ - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'
230+ - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
197231 - echo -en 'travis_fold:end:haddock\\r'
232+ # Constraint sets
233+ - rm -rf cabal.project.local
234+ # Constraint set http-media-0.8
235+ - echo 'Constraint set http-media-0.8' && echo -en 'travis_fold:start:constraint-sets-http-media-0.8\\r'
236+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='http-media ==0.8.*' all | color_cabal_output
237+ - echo -en 'travis_fold:end:constraint-sets-http-media-0.8\\r'
238+ # Constraint set http-media-0.7
239+ - echo 'Constraint set http-media-0.7' && echo -en 'travis_fold:start:constraint-sets-http-media-0.7\\r'
240+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='http-media ==0.7.*' all | color_cabal_output
241+ - echo -en 'travis_fold:end:constraint-sets-http-media-0.7\\r'
242+
198243# REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"]
199244# EOF
cabal.haskell-ci+7−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,9 @@ 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.*
cabal.project+2
@@ -51,3 +51,5 @@ allow-newer:
5151 servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
5252 servant-quickcheck:hspec,
5353 servant-quickcheck:http-client
54+
55+allow-newer: http-media
servant-client-core/servant-client-core.cabal+3−2
@@ -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
@@ -77,7 +78,7 @@ library
7778 , base64-bytestring >= 1.0.0.1 && < 1.1
7879 , exceptions >= 0.10.0 && < 0.11
7980 , free >= 5.1 && < 5.2
80− , http-media >= 0.7.1.3 && < 0.8
81+ , http-media >= 0.7.1.3 && < 0.9
8182 , http-types >= 0.12.2 && < 0.13
8283 , network-uri >= 2.6.1.0 && < 2.7
8384 , safe >= 0.3.17 && < 0.4
@@ -105,7 +106,7 @@ test-suite spec
105106 build-depends:
106107 deepseq >= 1.4.2.0 && < 1.5
107108 , hspec >= 2.6.0 && < 2.8
108− , QuickCheck >= 2.12.6.1 && < 2.13
109+ , QuickCheck >= 2.12.6.1 && < 2.14
109110
110111 build-tool-depends:
111112 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+3−2
@@ -1,6 +1,7 @@
11cabal-version: >=1.10
22name: servant-client
33version: 0.16
4+x-revision: 1
45
56synopsis: Automatic derivation of querying functions for servant
67category: Servant, Web
@@ -69,7 +70,7 @@ library
6970 build-depends:
7071 base-compat >= 0.10.5 && < 0.11
7172 , http-client >= 0.5.13.1 && < 0.7
72− , http-media >= 0.7.1.3 && < 0.8
73+ , http-media >= 0.7.1.3 && < 0.9
7374 , http-types >= 0.12.2 && < 0.13
7475 , exceptions >= 0.10.0 && < 0.11
7576 , kan-extensions >= 5.2 && < 5.3
@@ -118,7 +119,7 @@ test-suite spec
118119 , hspec >= 2.6.0 && < 2.8
119120 , HUnit >= 1.6.0.0 && < 1.7
120121 , network >= 2.8.0.0 && < 3.1
121− , QuickCheck >= 2.12.6.1 && < 2.13
122+ , QuickCheck >= 2.12.6.1 && < 2.14
122123 , servant == 0.16.*
123124 , servant-server == 0.16.*
124125 , tdigest >= 0.2 && < 0.3
servant-docs/servant-docs.cabal+2−2
@@ -1,7 +1,7 @@
11cabal-version: >=1.10
22name: servant-docs
33version: 0.11.3
4−x-revision: 1
4+x-revision: 2
55
66synopsis: generate API docs for your servant webservice
77category: Servant, Web
@@ -63,7 +63,7 @@ library
6363 , case-insensitive >= 1.2.0.11 && < 1.3
6464 , control-monad-omega >= 0.3.1 && < 0.4
6565 , hashable >= 1.2.7.0 && < 1.3
66− , http-media >= 0.7.1.3 && < 0.8
66+ , http-media >= 0.7.1.3 && < 0.9
6767 , http-types >= 0.12.2 && < 0.13
6868 , lens >= 4.17 && < 4.18
6969 , string-conversions >= 0.4.0.1 && < 0.5
servant-http-streams/servant-http-streams.cabal+3−2
@@ -1,6 +1,7 @@
11cabal-version: >=1.10
22name: servant-http-streams
33version: 0.16
4+x-revision: 1
45
56synopsis: Automatic derivation of querying functions for servant
67category: Servant, Web
@@ -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
@@ -119,7 +120,7 @@ test-suite spec
119120 , hspec >= 2.6.0 && < 2.8
120121 , HUnit >= 1.6.0.0 && < 1.7
121122 , network >= 2.8.0.0 && < 3.1
122− , QuickCheck >= 2.12.6.1 && < 2.13
123+ , QuickCheck >= 2.12.6.1 && < 2.14
123124 , servant == 0.16.*
124125 , servant-server == 0.16.*
125126 , tdigest >= 0.2 && < 0.3
servant-server/servant-server.cabal+3−2
@@ -1,6 +1,7 @@
11cabal-version: >=1.10
22name: servant-server
33version: 0.16
4+x-revision: 1
45
56synopsis: A family of combinators for defining webservices APIs and serving them
67category: Servant, Web
@@ -88,7 +89,7 @@ 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
@@ -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/servant.cabal+5−3
@@ -1,6 +1,7 @@
11cabal-version: >=1.10
22name: servant
33version: 0.16
4+x-revision: 1
45
56synopsis: A family of combinators for defining webservices APIs
67category: Servant, Web
@@ -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/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