travis GHC updates, stack updates, fix benchmark build failure, fix some .cabal warnings in benchmarks

Author: bergmark

.travis.yml

@@ -19,18 +19,18 @@ before_cache:
 
 matrix:
   include:
-    - env: BUILD=hlint CABALVER=1.24 GHCVER=8.0.2
+    - env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.1
+      compiler: ": #GHC 8.2.1"
+      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
+    - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-bench.yaml
+      compiler: ": #GHC 8.2.1"
+      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
+    - env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-ffi-unescape.yaml
+      compiler: ": #GHC 8.2.1"
+      addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
+    - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
       compiler: ": #GHC 8.0.2"
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
-    - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-bench.yaml
-      compiler: ": #GHC 8.0.2"
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
-    - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-ffi-unescape.yaml
-      compiler: ": #GHC 8.0.2"
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
-    - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2
-      compiler: ": #GHC 8.0.2"
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
     - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
       compiler: ": #GHC 7.4.2"
       addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}

benchmarks/aeson-benchmarks.cabal

@@ -1,8 +1,7 @@
 name:                aeson-benchmarks
 version:             0
 build-type:          Simple
-
-cabal-version:       >=1.8
+cabal-version:       >=1.10
 
 flag bytestring-builder
   description: Depend on the bytestring-builder package for backwards compatibility.
@@ -15,6 +14,7 @@ library
   c-sources:  ../cbits/unescape_string.c
   exposed-modules:
     Data.Aeson
+    Data.Aeson.Compat
     Data.Aeson.Encoding
     Data.Aeson.Encoding.Builder
     Data.Aeson.Encoding.Internal
@@ -81,6 +81,7 @@ library
   cpp-options: -DGENERICS
 
 executable aeson-benchmark-escape
+  default-language: Haskell2010
   main-is: Escape.hs
   hs-source-dirs: ../examples .
   ghc-options: -Wall -O2 -rtsopts
@@ -95,6 +96,7 @@ executable aeson-benchmark-escape
     text
 
 executable aeson-benchmark-compare
+  default-language: Haskell2010
   main-is: Compare.hs
   hs-source-dirs: ../examples .
   ghc-options: -Wall -O2 -rtsopts
@@ -118,6 +120,7 @@ executable aeson-benchmark-compare
     text
 
 executable aeson-benchmark-micro
+  default-language: Haskell2010
   main-is: Micro.hs
   hs-source-dirs: ../examples .
   ghc-options: -Wall -O2 -rtsopts
@@ -132,6 +135,7 @@ executable aeson-benchmark-micro
     text
 
 executable aeson-benchmark-typed
+  default-language: Haskell2010
   main-is: Typed.hs
   hs-source-dirs: ../examples .
   ghc-options: -Wall -O2 -rtsopts
@@ -166,6 +170,7 @@ executable aeson-benchmark-typed
     build-depends: bytestring >= 0.10.4
 
 executable aeson-benchmark-compare-with-json
+  default-language: Haskell2010
   main-is: CompareWithJSON.hs
   ghc-options: -Wall -O2 -rtsopts
   cpp-options: -DHAS_BOTH_AESON_AND_BENCHMARKS
@@ -182,6 +187,7 @@ executable aeson-benchmark-compare-with-json
     text
 
 executable aeson-benchmark-aeson-encode
+  default-language: Haskell2010
   main-is: AesonEncode.hs
   ghc-options: -Wall -O2 -rtsopts
   build-depends:
@@ -194,6 +200,7 @@ executable aeson-benchmark-aeson-encode
     time
 
 executable aeson-benchmark-aeson-parse
+  default-language: Haskell2010
   main-is: AesonParse.hs
   ghc-options: -Wall -O2 -rtsopts
   build-depends:
@@ -205,6 +212,7 @@ executable aeson-benchmark-aeson-parse
     time
 
 executable aeson-benchmark-json-parse
+  default-language: Haskell2010
   main-is: JsonParse.hs
   ghc-options: -Wall -O2 -rtsopts
   build-depends:
@@ -215,6 +223,7 @@ executable aeson-benchmark-json-parse
     time
 
 executable aeson-benchmark-dates
+  default-language: Haskell2010
   main-is: Dates.hs
   ghc-options: -Wall -O2 -rtsopts
   build-depends:
@@ -228,6 +237,7 @@ executable aeson-benchmark-dates
     time
 
 executable aeson-benchmark-map
+  default-language: Haskell2010
   main-is: AesonMap.hs
   ghc-options: -Wall -O2 -rtsopts
   build-depends:
@@ -245,6 +255,7 @@ executable aeson-benchmark-map
     unordered-containers
 
 executable aeson-benchmark-foldable
+  default-language: Haskell2010
   main-is: AesonFoldable.hs
   ghc-options: -Wall -O2 -rtsopts
   build-depends:

cabal.project

@@ -1,2 +1,2 @@
 with-compiler: ghc
-packages: .
+packages: ., attoparsec-iso8601

examples/Twitter/Options.hs

@@ -11,9 +11,7 @@ import Data.Aeson
 import Data.Aeson.Types
 #else
 import "aeson" Data.Aeson
-import "aeson" Data.Aeson.Types
 import qualified "aeson-benchmarks" Data.Aeson as B
-import qualified "aeson-benchmarks" Data.Aeson.Types as B
 #endif
 
 twitterOptions :: Options

stack-bench.yaml

@@ -1,4 +1,4 @@
-resolver: lts-8.5
+resolver: nightly-2017-10-18
 # We use aeson in the snapshot to
 # - avoid recompilation of criterion
 # - compare against it
@@ -10,6 +10,4 @@ work-dir: .stack-work-bench
 packages:
 - benchmarks
 extra-deps:
-- aeson-1.2.1.0
-- quickcheck-instances-0.3.14
-- th-abstraction-0.2.2.0
+- aeson-1.2.2.0

stack-ffi-unescape.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2017-09-04
+resolver: nightly-2017-10-18
 packages:
 - '.'
 flags:

stack-lts6.yaml

@@ -1,4 +1,4 @@
-resolver: lts-6.30
+resolver: lts-6.35
 packages:
 - '.'
 - attoparsec-iso8601

stack-lts7.yaml

@@ -1,4 +1,4 @@
-resolver: lts-7.19
+resolver: lts-7.24
 packages:
 - '.'
 - attoparsec-iso8601

stack-lts8.yaml

@@ -1,4 +1,4 @@
-resolver: lts-8.5
+resolver: lts-8.24
 packages:
 - '.'
 - attoparsec-iso8601

stack-lts9.yaml

@@ -1,4 +1,4 @@
-resolver: lts-9.3
+resolver: lts-9.9
 packages:
 - '.'
 - attoparsec-iso8601