Updated to GHC 7.10.1

Author: sebright

.travis.yml

@@ -25,7 +25,7 @@ env:
  # - CABALVER=1.18 GHCVER=7.8.1
  # - CABALVER=1.18 GHCVER=7.8.2
  # - CABALVER=1.18 GHCVER=7.8.3
- # - CABALVER=1.22 GHCVER=7.10.1
+ - CABALVER=1.22 GHCVER=7.10.1
 # - CABALVER=head GHCVER=head
  - CABALVER=1.18 HPVER=2014.2.0.0
  # - HPVER=2013.2.0.0

json-rpc-server.cabal

@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                json-rpc-server
-version:             0.1.4.0
+version:             0.1.5.0
 license:             MIT
 license-file:        LICENSE
 category:            Network, JSON
@@ -30,7 +30,7 @@ flag demo
 library
   exposed-modules:     Network.JsonRpc.Server
   other-modules:       Network.JsonRpc.Types
-  build-depends:       base >=4.3 && <4.8,
+  build-depends:       base >=4.3 && <4.9,
                        aeson >=0.6 && <0.9,
                        bytestring >=0.9 && <0.11,
                        mtl >=1.1.1 && <2.3,
@@ -44,7 +44,7 @@ executable demo
   main-is:             Demo.hs
   hs-source-dirs:      demo
   if flag (demo)
-    build-depends:     base >=4.3 && <4.8,
+    build-depends:     base >=4.3 && <4.9,
                        json-rpc-server,
                        bytestring >=0.9 && <0.11,
                        mtl >=1.1.1 && <2.3
@@ -56,7 +56,7 @@ test-suite tests
   main-is:             TestSuite.hs
   other-modules:       TestParallelism, Internal
   type:                exitcode-stdio-1.0
-  build-depends:       base >=4.3 && <4.8,
+  build-depends:       base >=4.3 && <4.9,
                        json-rpc-server,
                        HUnit >=1.2 && <1.3,
                        test-framework >=0.7 && <0.9,

src/Network/JsonRpc/Server.hs

@@ -43,11 +43,14 @@ import qualified Data.ByteString.Lazy as B
 import qualified Data.Aeson as A
 import qualified Data.Vector as V
 import qualified Data.HashMap.Strict as H
-import Control.Applicative ((<$>))
 import Control.Monad (liftM)
 import Control.Monad.Identity (runIdentity)
 import Control.Monad.Error (runErrorT, throwError)
 
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+#endif
+
 -- $instructions
 -- * Create methods by calling 'toMethod' and providing the method
 --   names, lists of parameters, and functions to be called.

src/Network/JsonRpc/Types.hs

@@ -32,10 +32,14 @@ import Data.Aeson ((.=), (.:), (.:?), (.!=))
 import Data.Aeson.Types (emptyObject)
 import qualified Data.Vector as V
 import qualified Data.HashMap.Strict as H
-import Control.Applicative ((<$>), (<*>), (<|>), (*>), empty)
 import Control.Monad (mplus, when)
 import Control.Monad.Error (Error, ErrorT, throwError, strMsg, noMsg)
 import Prelude hiding (length)
+import Control.Applicative ((<|>), empty)
+
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>), (<*>), (*>))
+#endif
 
 -- | Return type of a method. A method call can either fail with an 'RpcError'
 --   or succeed with a result of type 'r'.

tests/Internal.hs

@@ -1,4 +1,5 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP,
+             OverloadedStrings #-}
 
 module Internal ( request
                 , errRsp
@@ -21,7 +22,10 @@ import qualified Data.HashMap.Strict as H
 import Data.Maybe (catMaybes)
 import qualified Data.Vector as V
 import Data.Text (Text)
+
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative ((<$>))
+#endif
 
 array :: [A.Value] -> A.Value
 array = A.Array . V.fromList

tests/TestParallelism.hs

@@ -1,4 +1,5 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP,
+             OverloadedStrings #-}
 
 module TestParallelism (testParallelizingTasks) where
 
@@ -11,12 +12,15 @@ import qualified Data.Aeson as A
 import Data.Aeson ((.=))
 import qualified Data.Aeson.Types as A
 import Data.Maybe (fromJust)
-import Control.Applicative ((<$>))
 import Control.Monad.Trans (liftIO)
 import Control.Concurrent (forkIO)
 import Control.Concurrent.MVar (MVar, newEmptyMVar, putMVar, takeMVar)
 import Test.HUnit (Assertion, assert)
 
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+#endif
+
 -- | Tests parallelizing a batch request.  Each request either
 --   locks or unlocks an MVar.  The MVar is initially locked,
 --   so the first lock request cannot succeed if the requests

tests/TestSuite.hs

@@ -1,4 +1,5 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP,
+             OverloadedStrings #-}
 
 module Main (main) where
 
@@ -16,7 +17,6 @@ import qualified Data.Aeson as A
 import Data.Aeson ((.=))
 import qualified Data.Aeson.Types as A
 import qualified Data.HashMap.Strict as H
-import Control.Applicative ((<$>))
 import Control.Monad.Trans (liftIO)
 import Control.Monad.State (State, runState, lift, modify)
 import Control.Monad.Identity (Identity, runIdentity)
@@ -25,6 +25,10 @@ import Test.Framework (defaultMain, Test)
 import Test.Framework.Providers.HUnit (testCase)
 import Prelude hiding (subtract)
 
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+#endif
+
 main :: IO ()
 main = defaultMain $ errorHandlingTests ++ otherTests