git.iko.soy/typeable/http-api-data
on master help sign in
Merge pull request #104 from fizruk/prepare-0.4.2
192cb85Oleg Grenrus
.travis.yml+21−17
compare with master
unifiedsplit
@@ -2,9 +2,13 @@
2#
2#
3# haskell-ci '--config=cabal.haskell-ci' 'http-api-data.cabal'
3# haskell-ci '--config=cabal.haskell-ci' 'http-api-data.cabal'
4#
4#
5+# To regenerate the script (for example after adjusting tested-with) run
6+#
7+# haskell-ci regenerate
8+#
5# For more information, see https://github.com/haskell-CI/haskell-ci
9# For more information, see https://github.com/haskell-CI/haskell-ci
6#
10#
7−# version: 0.9.20200326
11+# version: 0.10.3
8#
12#
9version: ~> 1.0
13version: ~> 1.0
10language: c
14language: c
@@ -32,29 +36,29 @@ before_cache:
32 - rm -rfv $CABALHOME/packages/head.hackage
36 - rm -rfv $CABALHOME/packages/head.hackage
33jobs:
37jobs:
34 include:
38 include:
35− - compiler: ghc-8.10.1
39+ - compiler: ghc-8.10.2
36− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.2"]}}
40+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.2","cabal-install-3.2"]}}
37 os: linux
41 os: linux
38− - compiler: ghc-8.8.3
42+ - compiler: ghc-8.8.4
39− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.3","cabal-install-3.0"]}}
43+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.4","cabal-install-3.2"]}}
40 os: linux
44 os: linux
41 - compiler: ghc-8.6.5
45 - compiler: ghc-8.6.5
42− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
46+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
43 os: linux
47 os: linux
44 - compiler: ghc-8.4.4
48 - compiler: ghc-8.4.4
45− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
49+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.2"]}}
46 os: linux
50 os: linux
47 - compiler: ghc-8.2.2
51 - compiler: ghc-8.2.2
48− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
52+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.2"]}}
49 os: linux
53 os: linux
50 - compiler: ghc-8.0.2
54 - compiler: ghc-8.0.2
51− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
55+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.2"]}}
52 os: linux
56 os: linux
53 - compiler: ghc-7.10.3
57 - compiler: ghc-7.10.3
54− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
58+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.2"]}}
55 os: linux
59 os: linux
56 - compiler: ghc-7.8.4
60 - compiler: ghc-7.8.4
57− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
61+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.2"]}}
58 os: linux
62 os: linux
59before_install:
63before_install:
60 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
64 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
@@ -99,14 +103,14 @@ install:
99 - cat $CABALHOME/config
103 - cat $CABALHOME/config
100 - rm -fv cabal.project cabal.project.local cabal.project.freeze
104 - rm -fv cabal.project cabal.project.local cabal.project.freeze
101 - travis_retry ${CABAL} v2-update -v
105 - travis_retry ${CABAL} v2-update -v
102− - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 81000 ] ; then (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 doctest --constraint='doctest ==0.16.2.*') ; fi
106+ - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 81000 ] ; then ${CABAL} v2-install $WITHCOMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi
103 # Generate cabal.project
107 # Generate cabal.project
104 - rm -rf cabal.project cabal.project.local cabal.project.freeze
108 - rm -rf cabal.project cabal.project.local cabal.project.freeze
105 - touch cabal.project
109 - touch cabal.project
106 - |
110 - |
107 echo "packages: ." >> cabal.project
111 echo "packages: ." >> cabal.project
108− - if [ $HCNUMVER -ge 80000 ] ; then echo 'package http-api-data' >> cabal.project ; fi
112+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package http-api-data' >> cabal.project ; fi
109− - "if [ $HCNUMVER -ge 80000 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
113+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
110 - |
114 - |
111 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
115 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
112 - cat cabal.project || true
116 - cat cabal.project || true
@@ -132,8 +136,8 @@ script:
132 - touch cabal.project
136 - touch cabal.project
133 - |
137 - |
134 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
138 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
135− - if [ $HCNUMVER -ge 80000 ] ; then echo 'package http-api-data' >> cabal.project ; fi
139+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package http-api-data' >> cabal.project ; fi
136− - "if [ $HCNUMVER -ge 80000 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
140+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
137 - |
141 - |
138 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
142 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
139 - cat cabal.project || true
143 - cat cabal.project || true
@@ -160,5 +164,5 @@ script:
160 # Constraint set text-show
164 # Constraint set text-show
161 - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all
165 - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all
162
166
163−# REGENDATA ("0.9.20200326",["--config=cabal.haskell-ci","http-api-data.cabal"])
167+# REGENDATA ("0.10.3",["--config=cabal.haskell-ci","http-api-data.cabal"])
164# EOF
168# EOF
CHANGELOG.md+11
@@ -1,3 +1,14 @@
1+0.4.2
2+-----
3+
4+* Add instances for `Const` and `Identity`
5+
6+0.4.1.1
7+-------
8+
9+* Allow cookie <0.5
10+* Change to `build-type: Simple`
11+
10.4.1
120.4.1
2-----
13-----
3
14
http-api-data.cabal+4−5
@@ -1,7 +1,6 @@
1cabal-version: >= 1.10
1cabal-version: >= 1.10
2name: http-api-data
2name: http-api-data
3−version: 0.4.1.1
3+version: 0.4.2
4−x-revision: 1
5
4
6synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
5synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
7category: Web
6category: Web
@@ -31,8 +30,8 @@ tested-with:
31 GHC==8.2.2,
30 GHC==8.2.2,
32 GHC==8.4.4,
31 GHC==8.4.4,
33 GHC==8.6.5,
32 GHC==8.6.5,
34− GHC==8.8.3,
33+ GHC==8.8.4,
35− GHC==8.10.1
34+ GHC==8.10.2
36
35
37flag use-text-show
36flag use-text-show
38 description: Use text-show library for efficient ToHttpApiData implementations.
37 description: Use text-show library for efficient ToHttpApiData implementations.
@@ -113,7 +112,7 @@ test-suite spec
113
112
114 build-depends: HUnit >= 1.6.0.0 && <1.7
113 build-depends: HUnit >= 1.6.0.0 && <1.7
115 , hspec >= 2.7.1 && <2.8
114 , hspec >= 2.7.1 && <2.8
116− , QuickCheck >= 2.13.1 && <2.14
115+ , QuickCheck >= 2.13.1 && <2.15
117 , quickcheck-instances >= 0.3.21 && <0.4
116 , quickcheck-instances >= 0.3.21 && <0.4
118
117
119source-repository head
118source-repository head