Skip to content

Commit

Permalink
Merge pull request #328 from phadej/aeson-1.4
Browse files Browse the repository at this point in the history
Allow aeson-1.4
  • Loading branch information
phadej committed Jun 12, 2018
2 parents 852a12f + 8dfa3d7 commit 0f60196
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
19 changes: 11 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,21 @@ before_cache:

matrix:
include:
- compiler: "ghc-7.8.4"
- compiler: "ghc-8.4.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
- compiler: "ghc-7.10.3"
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
- compiler: "ghc-8.2.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
- compiler: "ghc-8.0.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
- compiler: "ghc-8.2.2"
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
- compiler: "ghc-7.10.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
- compiler: "ghc-7.8.4"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}

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

# Here starts the actual work to be performed for the package under test;
Expand Down
6 changes: 3 additions & 3 deletions github.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: github
version: 0.19
x-revision: 2
x-revision: 3
synopsis: Access to the GitHub API, v3.
description:
The GitHub API provides programmatic access to the full
Expand All @@ -26,7 +26,7 @@ homepage: https://github.com/phadej/github
copyright: Copyright 2012-2013 Mike Burns, Copyright 2013-2015 John Wiegley, Copyright 2016 Oleg Grenrus
category: Network
build-type: Simple
tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
cabal-version: >=1.10
extra-source-files:
README.md,
Expand Down Expand Up @@ -145,7 +145,7 @@ Library

-- other packages
build-depends:
aeson >=0.7.0.6 && <1.4,
aeson >=0.7.0.6 && <1.5,
base-compat >=0.9.1 && <0.11,
base16-bytestring >=0.1.1.6 && <0.2,
binary >=0.7.1.0 && <0.10,
Expand Down

0 comments on commit 0f60196

Please sign in to comment.