Skip to content

Commit 8dfa3d7

Browse files
committed
Allow aeson-1.4
1 parent 852a12f commit 8dfa3d7

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

.travis.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,21 @@ before_cache:
3232

3333
matrix:
3434
include:
35-
- compiler: "ghc-7.8.4"
35+
- compiler: "ghc-8.4.3"
3636
# env: TEST=--disable-tests BENCH=--disable-benchmarks
37-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
38-
- 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"
3939
# env: TEST=--disable-tests BENCH=--disable-benchmarks
40-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
40+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
4141
- compiler: "ghc-8.0.2"
4242
# env: TEST=--disable-tests BENCH=--disable-benchmarks
43-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
44-
- compiler: "ghc-8.2.2"
43+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
44+
- compiler: "ghc-7.10.3"
45+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
46+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
47+
- compiler: "ghc-7.8.4"
4548
# env: TEST=--disable-tests BENCH=--disable-benchmarks
46-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
49+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
4750

4851
before_install:
4952
- HC=${CC}
@@ -75,7 +78,7 @@ install:
7578
- rm -f cabal.project.freeze
7679
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
7780
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
78-
- rm -rf "."/.ghc.environment.* "."/dist
81+
- rm -rf .ghc.environment.* "."/dist
7982
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
8083

8184
# Here starts the actual work to be performed for the package under test;

github.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: github
22
version: 0.19
3-
x-revision: 2
3+
x-revision: 3
44
synopsis: Access to the GitHub API, v3.
55
description:
66
The GitHub API provides programmatic access to the full
@@ -26,7 +26,7 @@ homepage: https://github.com/phadej/github
2626
copyright: Copyright 2012-2013 Mike Burns, Copyright 2013-2015 John Wiegley, Copyright 2016 Oleg Grenrus
2727
category: Network
2828
build-type: Simple
29-
tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
29+
tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
3030
cabal-version: >=1.10
3131
extra-source-files:
3232
README.md,
@@ -145,7 +145,7 @@ Library
145145

146146
-- other packages
147147
build-depends:
148-
aeson >=0.7.0.6 && <1.4,
148+
aeson >=0.7.0.6 && <1.5,
149149
base-compat >=0.9.1 && <0.11,
150150
base16-bytestring >=0.1.1.6 && <0.2,
151151
binary >=0.7.1.0 && <0.10,

0 commit comments

Comments
 (0)