git.iko.soy/typeable/aeson
on master help sign in
travis GHC updates, stack updates, fix benchmark build failure, fix some .cabal warnings in benchmarks
commit6bc3b7dfc8618f270266e05a4d37cf8ccf272d3c authorAdam Bergmark <adam@bergmark.nl> dateWed 18 Oct 2017, 20:52 (9 years ago) parent07564d8
12 files changed+35−28
compare with master
unifiedsplit
.travis.yml+11−11 benchmarks/aeson-benchmarks.cabal+13−2 cabal.project+1−1 examples/Twitter/Options.hs−2 stack-bench.yaml+2−4 stack-ffi-unescape.yaml+1−1 stack-lts6.yaml+1−1 stack-lts7.yaml+1−1 stack-lts8.yaml+1−1 stack-lts9.yaml+1−1 stack-nightly.yaml+1−1 travis/script.sh+2−2
.travis.yml+11−11
@@ -19,18 +19,18 @@ before_cache:
1919
2020matrix:
2121 include:
22− - env: BUILD=hlint CABALVER=1.24 GHCVER=8.0.2
22+ - env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.1
23+ compiler: ": #GHC 8.2.1"
24+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
25+ - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-bench.yaml
26+ compiler: ": #GHC 8.2.1"
27+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
28+ - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-ffi-unescape.yaml
29+ compiler: ": #GHC 8.2.1"
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
2332 compiler: ": #GHC 8.0.2"
24− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
25− - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-bench.yaml
26− compiler: ": #GHC 8.0.2"
27− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
28− - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-ffi-unescape.yaml
29− compiler: ": #GHC 8.0.2"
30− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
31− - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2
32− compiler: ": #GHC 8.0.2"
33− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
33+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
3434 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
3535 compiler: ": #GHC 7.4.2"
3636 addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
benchmarks/aeson-benchmarks.cabal+13−2
@@ -1,8 +1,7 @@
11name: aeson-benchmarks
22version: 0
33build-type: Simple
4−
5−cabal-version: >=1.8
4+cabal-version: >=1.10
65
76flag bytestring-builder
87 description: Depend on the bytestring-builder package for backwards compatibility.
@@ -15,6 +14,7 @@ library
1514 c-sources: ../cbits/unescape_string.c
1615 exposed-modules:
1716 Data.Aeson
17+ Data.Aeson.Compat
1818 Data.Aeson.Encoding
1919 Data.Aeson.Encoding.Builder
2020 Data.Aeson.Encoding.Internal
@@ -81,6 +81,7 @@ library
8181 cpp-options: -DGENERICS
8282
8383executable aeson-benchmark-escape
84+ default-language: Haskell2010
8485 main-is: Escape.hs
8586 hs-source-dirs: ../examples .
8687 ghc-options: -Wall -O2 -rtsopts
@@ -95,6 +96,7 @@ executable aeson-benchmark-escape
9596 text
9697
9798executable aeson-benchmark-compare
99+ default-language: Haskell2010
98100 main-is: Compare.hs
99101 hs-source-dirs: ../examples .
100102 ghc-options: -Wall -O2 -rtsopts
@@ -118,6 +120,7 @@ executable aeson-benchmark-compare
118120 text
119121
120122executable aeson-benchmark-micro
123+ default-language: Haskell2010
121124 main-is: Micro.hs
122125 hs-source-dirs: ../examples .
123126 ghc-options: -Wall -O2 -rtsopts
@@ -132,6 +135,7 @@ executable aeson-benchmark-micro
132135 text
133136
134137executable aeson-benchmark-typed
138+ default-language: Haskell2010
135139 main-is: Typed.hs
136140 hs-source-dirs: ../examples .
137141 ghc-options: -Wall -O2 -rtsopts
@@ -166,6 +170,7 @@ executable aeson-benchmark-typed
166170 build-depends: bytestring >= 0.10.4
167171
168172executable aeson-benchmark-compare-with-json
173+ default-language: Haskell2010
169174 main-is: CompareWithJSON.hs
170175 ghc-options: -Wall -O2 -rtsopts
171176 cpp-options: -DHAS_BOTH_AESON_AND_BENCHMARKS
@@ -182,6 +187,7 @@ executable aeson-benchmark-compare-with-json
182187 text
183188
184189executable aeson-benchmark-aeson-encode
190+ default-language: Haskell2010
185191 main-is: AesonEncode.hs
186192 ghc-options: -Wall -O2 -rtsopts
187193 build-depends:
@@ -194,6 +200,7 @@ executable aeson-benchmark-aeson-encode
194200 time
195201
196202executable aeson-benchmark-aeson-parse
203+ default-language: Haskell2010
197204 main-is: AesonParse.hs
198205 ghc-options: -Wall -O2 -rtsopts
199206 build-depends:
@@ -205,6 +212,7 @@ executable aeson-benchmark-aeson-parse
205212 time
206213
207214executable aeson-benchmark-json-parse
215+ default-language: Haskell2010
208216 main-is: JsonParse.hs
209217 ghc-options: -Wall -O2 -rtsopts
210218 build-depends:
@@ -215,6 +223,7 @@ executable aeson-benchmark-json-parse
215223 time
216224
217225executable aeson-benchmark-dates
226+ default-language: Haskell2010
218227 main-is: Dates.hs
219228 ghc-options: -Wall -O2 -rtsopts
220229 build-depends:
@@ -228,6 +237,7 @@ executable aeson-benchmark-dates
228237 time
229238
230239executable aeson-benchmark-map
240+ default-language: Haskell2010
231241 main-is: AesonMap.hs
232242 ghc-options: -Wall -O2 -rtsopts
233243 build-depends:
@@ -245,6 +255,7 @@ executable aeson-benchmark-map
245255 unordered-containers
246256
247257executable aeson-benchmark-foldable
258+ default-language: Haskell2010
248259 main-is: AesonFoldable.hs
249260 ghc-options: -Wall -O2 -rtsopts
250261 build-depends:
cabal.project+1−1
@@ -1,2 +1,2 @@
11with-compiler: ghc
2−packages: .
2+packages: ., attoparsec-iso8601
examples/Twitter/Options.hs−2
@@ -11,9 +11,7 @@ import Data.Aeson
1111import Data.Aeson.Types
1212#else
1313import "aeson" Data.Aeson
14−import "aeson" Data.Aeson.Types
1514import qualified "aeson-benchmarks" Data.Aeson as B
16−import qualified "aeson-benchmarks" Data.Aeson.Types as B
1715#endif
1816
1917twitterOptions :: Options
stack-bench.yaml+2−4
@@ -1,4 +1,4 @@
1−resolver: lts-8.5
1+resolver: nightly-2017-10-18
22# We use aeson in the snapshot to
33# - avoid recompilation of criterion
44# - compare against it
@@ -10,6 +10,4 @@ work-dir: .stack-work-bench
1010packages:
1111- benchmarks
1212extra-deps:
13−- aeson-1.2.1.0
14−- quickcheck-instances-0.3.14
15−- th-abstraction-0.2.2.0
13+- aeson-1.2.2.0
stack-ffi-unescape.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: nightly-2017-09-04
1+resolver: nightly-2017-10-18
22packages:
33- '.'
44flags:
stack-lts6.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: lts-6.30
1+resolver: lts-6.35
22packages:
33- '.'
44- attoparsec-iso8601
stack-lts7.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: lts-7.19
1+resolver: lts-7.24
22packages:
33- '.'
44- attoparsec-iso8601
stack-lts8.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: lts-8.5
1+resolver: lts-8.24
22packages:
33- '.'
44- attoparsec-iso8601
stack-lts9.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: lts-9.3
1+resolver: lts-9.9
22packages:
33- '.'
44- attoparsec-iso8601
stack-nightly.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: nightly-2017-09-04
1+resolver: nightly-2017-10-18
22packages:
33- '.'
44- attoparsec-iso8601
travis/script.sh+2−2
@@ -20,8 +20,8 @@ case $BUILD in
2020 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
2121 ;;
2222 hlint)
23− stack build --fast aeson --stack-yaml stack-lts8.yaml --system-ghc --no-terminal
24− stack install hlint-2.0.5 --stack-yaml stack-lts8.yaml --system-ghc --no-terminal
23+ stack build --fast aeson --stack-yaml stack-nightly.yaml --system-ghc --no-terminal
24+ stack install hlint --stack-yaml stack-nightly.yaml --system-ghc --no-terminal
2525 make lint
2626 ;;
2727esac