git.iko.soy/typeable/servant
on master help sign in
Merge pull request #872 from phadej/http-types-0.11

Http types 0.11

commit6fe2c78567fd262313febd104d8be91290ac80e8 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 10 Dec 2017, 14:55 (9 years ago) parentf3470c2ccf0056
9 files changed+31−37
.travis.yml+18−24 doc/tutorial/tutorial.cabal+1−1 servant-client-core/servant-client-core.cabal+2−2 servant-client-ghcjs/servant-client-ghcjs.cabal+1−1 servant-client/servant-client.cabal+2−2 servant-docs/servant-docs.cabal+1−1 servant-foreign/servant-foreign.cabal+1−1 servant-server/servant-server.cabal+3−3 servant/servant.cabal+2−2
.travis.yml+18−24
@@ -1,6 +1,6 @@
11# This Travis job script has been generated by a script via
22#
3−# make_travis_yml_2.hs '-f' '-o' '.travis.yml' 'cabal.project'
3+# make_travis_yml_2.hs '-f' '-o' '.travis.yml' '--branch' 'master' '--branch' 'release-0.12' 'cabal.project'
44#
55# For more information, see https://github.com/hvr/multi-ghc-travis
66#
@@ -12,8 +12,8 @@ git:
1212
1313branches:
1414 only:
15− - master
1615 - release-0.12
16+ - master
1717
1818cache:
1919 directories:
@@ -40,15 +40,16 @@ matrix:
4040 - compiler: "ghc-8.0.2"
4141 # env: TEST=--disable-tests BENCH=--disable-benchmarks
4242 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
43− - compiler: "ghc-8.2.1"
43+ - compiler: "ghc-8.2.2"
4444 # env: TEST=--disable-tests BENCH=--disable-benchmarks
45− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}
45+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
4646
4747before_install:
4848 - HC=${CC}
4949 - HCPKG=${HC/ghc/ghc-pkg}
5050 - unset CC
51− - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
51+ - ROOTDIR=$(pwd)
52+ - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH"
5253
5354install:
5455 - cabal --version
@@ -58,7 +59,7 @@ install:
5859 - HADDOCK=${HADDOCK-true}
5960 - INSTALLED=${INSTALLED-true}
6061 - travis_retry cabal update -v
61− - sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
62+ - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
6263 - rm -fv cabal.project.local
6364 - if [ -f "servant/configure.ac" ]; then
6465 (cd "servant"; autoreconf -i);
@@ -92,26 +93,21 @@ install:
9293script:
9394 # test that source-distributions can be generated
9495 - echo Packaging... && echo -en 'travis_fold:start:sdist\\r'
95− - (cd "servant"; cabal sdist)
96− - (cd "servant-client"; cabal sdist)
97− - (cd "servant-client-core"; cabal sdist)
98− - (cd "servant-docs"; cabal sdist)
99− - (cd "servant-foreign"; cabal sdist)
100− - (cd "servant-server"; cabal sdist)
101− - (cd "doc/tutorial"; cabal sdist)
96+ - (cd "servant" && cabal sdist)
97+ - (cd "servant-client" && cabal sdist)
98+ - (cd "servant-client-core" && cabal sdist)
99+ - (cd "servant-docs" && cabal sdist)
100+ - (cd "servant-foreign" && cabal sdist)
101+ - (cd "servant-server" && cabal sdist)
102+ - (cd "doc/tutorial" && cabal sdist)
102103 - echo -en 'travis_fold:end:sdist\\r'
103104 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
104105 - 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 ${DISTDIR}/
105− - cd ${DISTDIR}
106+ - cd ${DISTDIR} || false
106107 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
107− - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal\n' > cabal.project"
108−
108+ - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal\\n' > cabal.project"
109109 # Allow-newer and other cabal.project amendments
110110 - "echo 'allow-newer: servant-js:servant, servant-js:servant-foreign' >> cabal.project"
111−
112− # cryptonite
113− - "echo 'constraints: foundation >=0.0.14' >> cabal.project"
114−
115111 - echo -en 'travis_fold:end:unpack\\r'
116112 - echo Building... && echo -en 'travis_fold:start:build\\r'
117113 # this builds all libraries and executables (without tests/benchmarks)
@@ -120,9 +116,7 @@ script:
120116
121117 - echo Building with installed constraints for package in global-db... && echo -en 'travis_fold:start:build-installed\\r'
122118 # Build with installed constraints for packages in global-db
123− - if $INSTALLED; then
124− echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh;
125− else echo "Not building with installed constraints"; fi
119+ - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
126120 - echo -en 'travis_fold:end:build-installed\\r'
127121
128122 - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r'
@@ -139,5 +133,5 @@ script:
139133 - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
140134
141135 - echo -en 'travis_fold:end:haddock\\r'
142−# REGENDATA ["-f","-o",".travis.yml","cabal.project"]
136+# REGENDATA ["-f","-o",".travis.yml","--branch","master","--branch","release-0.12","cabal.project"]
143137# EOF
doc/tutorial/tutorial.cabal+1−1
@@ -12,7 +12,7 @@ tested-with:
1212 GHC==7.8.4
1313 GHC==7.10.3
1414 GHC==8.0.2
15− GHC==8.2.1
15+ GHC==8.2.2
1616extra-source-files:
1717 static/index.html
1818 static/ui.js
servant-client-core/servant-client-core.cabal+2−2
@@ -22,7 +22,7 @@ tested-with:
2222 GHC==7.8.4
2323 GHC==7.10.3
2424 GHC==8.0.2
25− GHC==8.2.1
25+ GHC==8.2.2
2626
2727source-repository head
2828 type: git
@@ -49,7 +49,7 @@ library
4949 , generics-sop >= 0.1.0.0 && < 0.4
5050 , http-api-data >= 0.3.6 && < 0.4
5151 , http-media >= 0.6.2 && < 0.8
52− , http-types >= 0.8.6 && < 0.11
52+ , http-types >= 0.8.6 && < 0.12
5353 , mtl >= 2.1 && < 2.3
5454 , network-uri >= 2.6 && < 2.7
5555 , safe >= 0.3.9 && < 0.4
servant-client-ghcjs/servant-client-ghcjs.cabal+1−1
@@ -39,7 +39,7 @@ library
3939 , ghcjs-base >= 0.2.0.0 && < 0.3.0.0
4040 , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0
4141 , http-media >= 0.6.2 && < 0.8
42− , http-types >= 0.8.6 && < 0.10
42+ , http-types >= 0.8.6 && < 0.12
4343 , monad-control >= 1.0.0.4 && < 1.1
4444 , mtl >= 2.1 && < 2.3
4545 , semigroupoids >= 4.3 && < 5.3
servant-client/servant-client.cabal+2−2
@@ -20,7 +20,7 @@ tested-with:
2020 GHC==7.8.4
2121 GHC==7.10.3
2222 GHC==8.0.2
23− GHC==8.2.1
23+ GHC==8.2.2
2424homepage: http://haskell-servant.readthedocs.org/
2525Bug-reports: http://github.com/haskell-servant/servant/issues
2626extra-source-files:
@@ -45,7 +45,7 @@ library
4545 , http-client >= 0.4.30 && < 0.6
4646 , http-client-tls >= 0.2.2 && < 0.4
4747 , http-media >= 0.6.2 && < 0.8
48− , http-types >= 0.8.6 && < 0.11
48+ , http-types >= 0.8.6 && < 0.12
4949 , exceptions >= 0.8 && < 0.9
5050 , monad-control >= 1.0.0.4 && < 1.1
5151 , mtl >= 2.1 && < 2.3
servant-docs/servant-docs.cabal+1−1
@@ -19,7 +19,7 @@ tested-with:
1919 GHC==7.8.4
2020 GHC==7.10.3
2121 GHC==8.0.2
22− GHC==8.2.1
22+ GHC==8.2.2
2323homepage: http://haskell-servant.readthedocs.org/
2424Bug-reports: http://github.com/haskell-servant/servant/issues
2525extra-source-files:
servant-foreign/servant-foreign.cabal+1−1
@@ -26,7 +26,7 @@ tested-with:
2626 GHC==7.8.4
2727 GHC==7.10.3
2828 GHC==8.0.2
29− GHC==8.2.1
29+ GHC==8.2.2
3030
3131source-repository head
3232 type: git
servant-server/servant-server.cabal+3−3
@@ -25,7 +25,7 @@ tested-with:
2525 GHC==7.8.4
2626 GHC==7.10.3
2727 GHC==8.0.2
28− GHC==8.2.1
28+ GHC==8.2.2
2929extra-source-files:
3030 include/*.h
3131 CHANGELOG.md
@@ -65,7 +65,7 @@ library
6565 , exceptions >= 0.8 && < 0.9
6666 , http-api-data >= 0.3 && < 0.4
6767 , http-media >= 0.4 && < 0.8
68− , http-types >= 0.8 && < 0.11
68+ , http-types >= 0.8 && < 0.12
6969 , network-uri >= 2.6 && < 2.7
7070 , monad-control >= 1.0.0.4 && < 1.1
7171 , mtl >= 2 && < 2.3
@@ -137,7 +137,7 @@ test-suite spec
137137 , directory
138138 , exceptions
139139 , hspec == 2.*
140− , hspec-wai >= 0.8 && <0.9
140+ , hspec-wai >= 0.8 && <0.10
141141 , http-types
142142 , mtl
143143 , network >= 2.6
servant/servant.cabal+2−2
@@ -21,7 +21,7 @@ tested-with:
2121 GHC==7.8.4
2222 GHC==7.10.3
2323 GHC==8.0.2
24− GHC==8.2.1
24+ GHC==8.2.2
2525extra-source-files:
2626 include/*.h
2727 CHANGELOG.md
@@ -71,7 +71,7 @@ library
7171 , case-insensitive >= 1.2 && < 1.3
7272 , http-api-data >= 0.3 && < 0.4
7373 , http-media >= 0.4 && < 0.8
74− , http-types >= 0.8 && < 0.11
74+ , http-types >= 0.8 && < 0.12
7575 , natural-transformation >= 0.4 && < 0.5
7676 , mtl >= 2.0 && < 2.3
7777 , mmorph >= 1 && < 1.2