Merge pull request #473 from phadej/travis-ghc-8.0

Add ghc-8.0.1 to travis matrix

Author: jkarni

.travis.yml

@@ -3,22 +3,25 @@ sudo: false
 language: c
 
 env:
-  - GHCVER=7.8.4
-  - GHCVER=7.10.2
+  - GHCVER=7.8.4 CABALVER=1.22
+  - GHCVER=7.10.3 CABALVER=1.22
+  - GHCVER=8.0.1 CABALVER=1.24
 
 addons:
   apt:
     sources:
       - hvr-ghc
     packages:
       - ghc-7.8.4
-      - ghc-7.10.2
+      - ghc-7.10.3
+      - ghc-8.0.1
       - cabal-install-1.22
+      - cabal-install-1.24
       - libgmp-dev
 
 install:
   - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)
-  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:$PATH
+  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
   - ghc --version
   - cabal --version
   - travis_retry cabal update

servant-client/servant-client.cabal

@@ -56,6 +56,8 @@ library
   hs-source-dirs: src
   default-language: Haskell2010
   ghc-options: -Wall
+  if impl(ghc >= 8.0)
+    ghc-options: -Wno-redundant-constraints
   include-dirs: include
 
 test-suite spec

servant-client/test/Servant/ClientSpec.hs

@@ -15,7 +15,11 @@
 {-# LANGUAGE TypeFamilies           #-}
 {-# LANGUAGE TypeOperators          #-}
 {-# LANGUAGE UndecidableInstances   #-}
+#if __GLASGOW_HASKELL__ >= 800
+{-# OPTIONS_GHC -freduction-depth=100 #-}
+#else
 {-# OPTIONS_GHC -fcontext-stack=100 #-}
+#endif
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 

servant-docs/servant-docs.cabal

@@ -50,6 +50,8 @@ library
   hs-source-dirs: src
   default-language: Haskell2010
   ghc-options: -Wall
+  if impl(ghc >= 8.0)
+    ghc-options: -Wno-redundant-constraints
   include-dirs: include
 
 executable greet-docs

servant-foreign/servant-foreign.cabal

@@ -37,6 +37,8 @@ library
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options:         -Wall
+  if impl(ghc >= 8.0)
+    ghc-options: -Wno-redundant-constraints
   include-dirs: include
   default-extensions:  CPP
                      , ConstraintKinds

servant-mock/servant-mock.cabal

@@ -29,7 +29,7 @@ library
     http-types >= 0.8 && <0.10,
     servant == 0.7.*,
     servant-server == 0.7.*,
-    transformers >= 0.3 && <0.5,
+    transformers >= 0.3 && <0.6,
     QuickCheck >= 2.7 && <2.9,
     wai >= 3.0 && <3.3
   hs-source-dirs:      src

servant-server/servant-server.cabal

@@ -74,6 +74,8 @@ library
   hs-source-dirs: src
   default-language: Haskell2010
   ghc-options: -Wall
+  if impl(ghc >= 8.0)
+    ghc-options: -Wno-redundant-constraints
   include-dirs: include
 
 executable greet
@@ -99,9 +101,11 @@ test-suite spec
   other-modules:
       Servant.Server.ErrorSpec
       Servant.Server.Internal.ContextSpec
-      Servant.ServerSpec
+      Servant.Server.RouterSpec
+      Servant.Server.StreamingSpec
       Servant.Server.UsingContextSpec
       Servant.Server.UsingContextSpec.TestCombinators
+      Servant.ServerSpec
       Servant.Utils.StaticFilesSpec
   build-depends:
       base == 4.*
@@ -122,7 +126,7 @@ test-suite spec
     , servant
     , servant-server
     , string-conversions
-    , should-not-typecheck == 2.*
+    , should-not-typecheck == 2.1.*
     , temporary
     , text
     , transformers

servant-server/src/Servant/Server/Internal/Context.hs

@@ -59,7 +59,7 @@ instance (Eq a, Eq (Context as)) => Eq (Context (a ': as)) where
 --
 -- >>> getContextEntry (True :. False :. EmptyContext) :: String
 -- ...
---     No instance for (HasContextEntry '[] [Char])
+-- ...No instance for (HasContextEntry '[] [Char])
 -- ...
 class HasContextEntry (context :: [*]) (val :: *) where
     getContextEntry :: Context context -> val

servant/servant.cabal

@@ -49,7 +49,7 @@ library
     Servant.Utils.Links
     Servant.Utils.Enter
   build-depends:
-      base >= 4.7 && < 4.9
+      base >= 4.7 && < 4.10
     , base-compat >= 0.9
     , aeson >= 0.7
     , attoparsec >= 0.12
@@ -88,6 +88,8 @@ library
                   , TypeSynonymInstances
                   , UndecidableInstances
   ghc-options: -Wall
+  if impl(ghc >= 8.0)
+    ghc-options: -Wno-redundant-constraints
   include-dirs: include
 
 test-suite spec

servant/src/Servant/Utils/Links.hs

@@ -72,14 +72,8 @@
 -- >>> let bad_link = Proxy :: Proxy ("hello" :> Delete '[JSON] ())
 -- >>> safeLink api bad_link
 -- ...
---     Could not deduce (Or
---                         (IsElem' (Verb 'DELETE 200 '[JSON] ()) (Verb 'GET 200 '[JSON] Int))
---                         (IsElem'
---                            ("hello" :> Delete '[JSON] ())
---                            ("bye" :> (QueryParam "name" String :> Delete '[JSON] ()))))
---       arising from a use of ‘safeLink’
---     In the expression: safeLink api bad_link
---     In an equation for ‘it’: it = safeLink api bad_link
+-- ...Could not deduce...
+-- ...
 --
 --  This error is essentially saying that the type family couldn't find
 --  bad_link under api after trying the open (but empty) type family