e9839cf · typeable/aeson

.travis.yml+8−8

compare with master

unifiedsplit

@@ -19,14 +19,14 @@ before_cache:

19

20matrix:

21 include:

22− - env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.1

22+ - env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.2

23− compiler: ": #GHC 8.2.1"

23+ compiler: ": #GHC 8.2.2"

24− addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}

24+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}

25− - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-bench.yaml

25+ - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.2 STACK_YAML=stack-bench.yaml

26− compiler: ": #GHC 8.2.1"

26+ compiler: ": #GHC 8.2.2"

27− addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}

27+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}

28− - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-ffi-unescape.yaml

28+ - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.2 STACK_YAML=stack-ffi-unescape.yaml

29− compiler: ": #GHC 8.2.1"

29+ compiler: ": #GHC 8.2.2"

30 addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}

31 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2

32 compiler: ": #GHC 8.0.2"

aeson.cabal+1−1

@@ -212,7 +212,7 @@ test-suite tests

212 directory,

213 dlist,

214 filepath,

215− generic-deriving >= 1.10 && < 1.12,

215+ generic-deriving >= 1.10 && < 1.13,

216 ghc-prim >= 0.2,

217 hashable >= 1.2.4.0,

218 scientific,

cabal.project+1−1

@@ -1,2 +1,2 @@

1with-compiler: ghc

2−packages: ., attoparsec-iso8601

2+packages: ., attoparsec-iso8601, benchmarks

stack-bench.yaml+2−2

@@ -1,4 +1,4 @@

1−resolver: nightly-2017-11-20

1+resolver: nightly-2017-12-23

2# We use aeson in the snapshot to

3# - avoid recompilation of criterion

4# - compare against it

@@ -10,4 +10,4 @@ work-dir: .stack-work-bench

10packages:

11- benchmarks

12extra-deps:

13−- aeson-1.2.2.0

13+- aeson-1.2.3.0

stack-ffi-unescape.yaml+1−1

@@ -1,4 +1,4 @@

1−resolver: nightly-2017-10-18

1+resolver: lts-10.0

2packages:

3- '.'

4flags:

stack-lts10.yamlnew file+9

@@ -0,0 +1,9 @@

1+resolver: lts-10.0

2+packages:

3+- '.'

4+flags:

5+ aeson:

6+ fast: true

7+ cffi: false

8+ attoparsec-iso8601:

9+ fast: true

stack-nightly.yaml+1−1

@@ -1,4 +1,4 @@

1−resolver: nightly-2017-11-20

1+resolver: nightly-2017-12-23

2packages:

3- '.'

4- attoparsec-iso8601