git.iko.soy/typeable/swagger2
on master help sign in
Merge pull request #158 from phadej/aeson-1.4

Aeson 1.4

commitbbffa068a34fab0165944aa75f3afaef58c5406c authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 12 Jun 2018, 13:18 (8 years ago) parentb234de93eaeb8c
2 files changed+14−12
compare with master
unifiedsplit
.travis.yml+11−10 swagger2.cabal+3−2
.travis.yml+11−10
@@ -32,24 +32,25 @@ before_cache:
3232
3333matrix:
3434 include:
35− - compiler: "ghc-7.8.4"
35+ - compiler: "ghc-8.4.3"
3636 # env: TEST=--disable-tests BENCH=--disable-benchmarks
37− env: HADDOCK=false
38− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
39− - compiler: "ghc-7.10.3"
37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
38+ - compiler: "ghc-8.2.2"
4039 # env: TEST=--disable-tests BENCH=--disable-benchmarks
4140 env: HADDOCK=false
42− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
41+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
4342 - compiler: "ghc-8.0.2"
4443 # env: TEST=--disable-tests BENCH=--disable-benchmarks
4544 env: HADDOCK=false
46− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
47− - compiler: "ghc-8.2.2"
45+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
46+ - compiler: "ghc-7.10.3"
4847 # env: TEST=--disable-tests BENCH=--disable-benchmarks
49− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
50− - compiler: "ghc-8.4.1"
48+ env: HADDOCK=false
49+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
50+ - compiler: "ghc-7.8.4"
5151 # env: TEST=--disable-tests BENCH=--disable-benchmarks
52− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
52+ env: HADDOCK=false
53+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
5354
5455before_install:
5556 - HC=${CC}
swagger2.cabal+3−2
@@ -1,6 +1,7 @@
11cabal-version: >=1.10
22name: swagger2
33version: 2.2.2
4+x-revision: 2
45
56synopsis: Swagger 2.0 data model
67description:
@@ -23,7 +24,7 @@ extra-source-files:
2324 , CHANGELOG.md
2425 , examples/*.hs
2526 , include/overlapping-compat.h
26−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
27+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
2728
2829custom-setup
2930 setup-depends:
@@ -67,7 +68,7 @@ library
6768 -- other dependencies
6869 build-depends:
6970 base-compat-batteries >=0.10.1 && <0.11
70− , aeson >=1.0.0.0 && <1.4
71+ , aeson >=1.0.0.0 && <1.5
7172 , generics-sop >=0.3.2.0 && <0.4
7273 , hashable >=1.2.7.0 && <1.3
7374 , http-media >=0.7.1.2 && <0.8