Merge pull request #2 from fimad/ghc-10

Support for ghc 7.10

Author: fimad

.travis.yml

@@ -1,9 +1,20 @@
-ghc: 7.8
-language: haskell
 notifications:
   email: false
 
-install: []
+env:
+ - CABALVER=1.18 GHCVER=7.8.4
+ - CABALVER=1.22 GHCVER=7.10.2
+
+before_install:
+ - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
+ - travis_retry sudo apt-get update
+ - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER # see note about happy/alex
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+
+install:
+ - cabal --version
+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - travis_retry cabal update
 
 before_script:
   - wget https://www.stackage.org/lts/cabal.config

example/prometheus-haskell-example.cabal

@@ -20,7 +20,7 @@ executable prometheus-haskell-example
   main-is:             Main.hs
   default-language:    Haskell2010
   build-depends:
-      base                      >=4.6 && <4.8
+      base                      >=4.7 && <5
     , bytestring                >=0.9
     , http-types
     , prometheus-client

prometheus-client/prometheus-client.cabal

@@ -34,7 +34,7 @@ library
     , Prometheus.Registry
   build-depends:
       atomic-primops     >=0.4
-    , base               >=4.6 && <4.8
+    , base               >=4.7 && <5
     , bytestring         >=0.9
     , containers
     , mtl                >=2
@@ -51,7 +51,7 @@ test-suite doctest
   ghc-options:          -Wall
   main-is:              doctest.hs
   build-depends:
-      base
+      base               >=4.7 && <5
     , doctest
     , prometheus-client
 
@@ -63,7 +63,7 @@ test-suite spec
   build-depends:
       QuickCheck
     , atomic-primops
-    , base               >=4.6 && <4.8
+    , base               >=4.7 && <5
     , bytestring
     , containers
     , hspec
@@ -81,7 +81,7 @@ benchmark bench
   hs-source-dirs:   benchmarks
   main-is:          Main.hs
   build-depends:
-      base               >=4.6 && <4.8
+      base               >=4.7 && <5
     , bytestring
     , criterion          >=1.1
     , prometheus-client

prometheus-metrics-ghc/prometheus-metrics-ghc.cabal

@@ -24,7 +24,7 @@ library
   exposed-modules:
       Prometheus.Metric.GHC
   build-depends:
-      base               >=4.6 && <4.8
+      base               >=4.7 && <5
     , prometheus-client
     , utf8-string        >=0.3
   ghc-options: -Wall
@@ -36,6 +36,6 @@ test-suite doctest
   ghc-options:          -Wall
   main-is:              doctest.hs
   build-depends:
-      base
+      base               >=4.7 && <5
     , doctest
     , prometheus-client

wai-middleware-prometheus/wai-middleware-prometheus.cabal

@@ -24,7 +24,7 @@ library
   exposed-modules:
       Network.Wai.Middleware.Prometheus
   build-depends:
-      base               >=4.6 && <4.8
+      base               >=4.7 && <5
     , bytestring         >=0.9
     , data-default
     , http-types
@@ -41,6 +41,6 @@ test-suite doctest
   ghc-options:          -Wall
   main-is:              doctest.hs
   build-depends:
-      base
+      base               >=4.7 && <5
     , doctest
     , prometheus-client