Merge pull request purescript#1420 from erdeszt/move-werror-to-travis-config

paf31 · paf31 · commit 5fae3534d873 · 2015-08-25T15:37:45.000-07:00
Move -Werror to travis config
diff --git a/.travis.yml b/.travis.yml
@@ -56,7 +56,7 @@ install:
   - cp -r .cabal-sandbox ~/cabal-sandboxes/$GHCVER-${STACKAGE:-none}
 script:
   - ./travis/configure.sh
-  - cabal build
+  - cabal build --ghc-options="-Werror"
   - cabal test
   - ./travis/test-install.sh
 after_script:
diff --git a/psci/tests/Main.hs b/psci/tests/Main.hs
@@ -1,11 +1,14 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TupleSections #-}
+{-# LANGUAGE CPP #-}
 
 module Main where
 
 import Control.Monad.Trans.State.Strict (runStateT)
 import Control.Monad (when, forM)
+#if __GLASGOW_HASKELL__ < 710
 import Control.Applicative
+#endif
 import Control.Monad.Writer.Strict (runWriterT)
 import Control.Monad.Trans.Except (runExceptT)
 
diff --git a/src/Language/PureScript/Sugar/Names/Exports.hs b/src/Language/PureScript/Sugar/Names/Exports.hs
@@ -26,7 +26,7 @@ import Data.List (find, intersect)
 import Data.Maybe (fromMaybe, mapMaybe)
 
 #if __GLASGOW_HASKELL__ < 710
-import Control.Applicative (Applicative(..), (<$>), (<*>))
+import Control.Applicative (Applicative(..), (<$>))
 #endif
 import Control.Monad
 import Control.Monad.Error.Class (MonadError(..))
diff --git a/src/Language/PureScript/Sugar/Names/Imports.hs b/src/Language/PureScript/Sugar/Names/Imports.hs
@@ -23,7 +23,7 @@ import Data.Maybe (fromMaybe, isNothing)
 
 import Control.Arrow (first)
 #if __GLASGOW_HASKELL__ < 710
-import Control.Applicative (Applicative(..), (<$>), (<*>))
+import Control.Applicative (Applicative(..), (<$>))
 #endif
 import Control.Monad
 import Control.Monad.Error.Class (MonadError(..))
diff --git a/tests/Main.hs b/tests/Main.hs
@@ -16,6 +16,7 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE CPP #-}
 
 -- Failing tests can specify the kind of error that should be thrown with a
 -- @shouldFailWith declaration. For example:
@@ -41,14 +42,18 @@ import qualified Language.PureScript.CoreFn as CF
 import Data.Char (isSpace)
 import Data.Maybe (mapMaybe, fromMaybe)
 import Data.List (isSuffixOf, sort, stripPrefix)
+#if __GLASGOW_HASKELL__ < 710
 import Data.Traversable (traverse)
+#endif
 import Data.Time.Clock (UTCTime())
 
 import qualified Data.Map as M
 
 import Control.Monad
 import Control.Monad.IO.Class (liftIO)
+#if __GLASGOW_HASKELL__ < 710
 import Control.Applicative
+#endif
 import Control.Arrow ((>>>))
 
 import Control.Monad.Reader
diff --git a/tests/common/TestsSetup.hs b/tests/common/TestsSetup.hs
@@ -21,6 +21,7 @@ import Data.Maybe (fromMaybe)
 import Control.Applicative
 #endif
 import Control.Monad
+
 import Control.Monad.Trans.Maybe
 
 import System.Process
