Expanded dependency version ranges

Author: sebright

.travis.yml

@@ -11,20 +11,21 @@
 # GHCVER. Omit lines with versions you don't need/want testing for.
 env:
  # - GHCVER=6.12.3
- # - GHCVER=7.0.1
+ - GHCVER=7.0.1 AESONVER=0.6.0.0
  # - GHCVER=7.0.2
  # - GHCVER=7.0.3
  # - GHCVER=7.0.4
  # - GHCVER=7.2.1
  # - GHCVER=7.2.2
- - GHCVER=7.4.1 AESONVER=0.6.1.0
+ # - GHCVER=7.4.1
  # - GHCVER=7.4.2
  # - GHCVER=7.6.1
- # - GHCVER=7.6.2
- - GHCVER=7.6.3 AESONVER=0.7.0.0
+ - GHCVER=7.6.2 AESONVER=0.7.0.0
+ - GHCVER=7.6.3 AESONVER=0.8.0.0
  # - GHCVER=7.8.1
- - HPVER=2013.2.0.0
- - HPVER=2012.4.0.0
+ - HPVER=2014.2.0.0
+ # - HPVER=2013.2.0.0
+ # - HPVER=2012.4.0.0
  - HPVER=2012.2.0.0
  # - HPVER=2011.4.0.0
 
@@ -34,6 +35,10 @@ before_install:
  - case "$HPVER" in
     "") ;;
 
+    "2014.2.0.0")
+      export GHCVER=7.8.3 ;
+      echo "constraints:async==2.0.1.5,attoparsec==0.10.4.0,case-insensitive==1.1.0.3,fgl==5.5.0.1,GLUT==2.5.1.1,GLURaw==1.4.0.1,haskell-src==1.0.1.6,hashable==1.2.2.0,html==1.0.1.2,HTTP==4000.2.10,HUnit==1.2.5.2,mtl==2.1.3.1,network==2.4.2.3,OpenGL==2.9.2.0,OpenGLRaw==1.5.0.0,parallel==3.2.0.4,parsec==3.1.5,primitive==0.5.2.1,QuickCheck==2.6,random==1.0.1.1,regex-base==0.93.2,regex-compat==0.95.1,regex-posix==0.95.2,split==0.2.2,stm==2.4.2,syb==0.4.1,text==1.1.0.0,transformers==0.3.0.0,unordered-containers==0.2.4.0,vector==0.10.9.1,xhtml==3000.2.1,zlib==0.5.4.1" > cabal.config ;;
+
     "2013.2.0.0")
       export GHCVER=7.6.3 ;
       echo "constraints:async==2.0.1.4,attoparsec==0.10.4.0,case-insensitive==1.0.0.1,cgi==3001.1.7.5,fgl==5.4.2.4,GLUT==2.4.0.0,GLURaw==1.3.0.0,haskell-src==1.0.1.5,hashable==1.1.2.5,html==1.0.1.2,HTTP==4000.2.8,HUnit==1.2.5.2,mtl==2.1.2,network==2.4.1.2,OpenGL==2.8.0.0,OpenGLRaw==1.3.0.0,parallel==3.2.0.3,parsec==3.1.3,QuickCheck==2.6,random==1.0.1.1,regex-base==0.93.2,regex-compat==0.95.1,regex-posix==0.95.2,split==0.2.2,stm==2.4.2,syb==0.4.0,text==0.11.3.1,transformers==0.3.0.0,unordered-containers==0.2.3.0,vector==0.10.0.1,xhtml==3000.2.1,zlib==0.5.4.1" > cabal.config ;;
@@ -61,6 +66,10 @@ before_install:
       echo "constraints:aeson=="$AESONVER >> cabal.config;
    fi
 
+   if [ "$AESONVER" = "0.6.0.0" ]; then
+       echo "constraints:attoparsec==0.8.6.1,blaze-builder==0.2.1.4,bytestring==0.9.1.8,happstack-server==6.2.4,hashable==1.1.2.0,mtl==1.1.1.0,network==2.3.0.1,test-framework-hunit==0.3.0,text==0.11.1.1,unordered-containers==0.1.3.0,vector==0.7.1,zlib==0.5.2.0" >> cabal.config;
+   fi
+
    if [[ $HPVER == 2012.* ]]; then
       echo "constraints:happstack-server==7.3.0" >> cabal.config;
    fi

json-rpc-server.cabal

@@ -30,12 +30,12 @@ flag demo
 library
   exposed-modules:     Network.JsonRpc.Server
   other-modules:       Network.JsonRpc.Types
-  build-depends:       base >=4.5 && <4.7,
-                       aeson >=0.6 && <0.8,
+  build-depends:       base >=4.3 && <4.8,
+                       aeson >=0.6 && <0.9,
                        bytestring >=0.9 && <0.11,
-                       mtl >=2.1 && <2.2,
+                       mtl >=1.1.1 && <2.3,
                        text >=0.11 && <1.2,
-                       vector >=0.8 && <0.11,
+                       vector >=0.7.1 && <0.11,
                        unordered-containers >=0.1 && <0.3
   hs-source-dirs:      src
   ghc-options:         -Wall
@@ -44,10 +44,10 @@ executable demo
   main-is:             Demo.hs
   hs-source-dirs:      demo
   if flag (demo)
-    build-depends:     base >=4.5 && <4.7,
+    build-depends:     base >=4.3 && <4.8,
                        json-rpc-server,
-                       mtl >=2.1 && <2.2,
-                       happstack-server >=7.3 && <7.4
+                       mtl >=1.1.1 && <2.3,
+                       happstack-server >=6.2.4 && <7.4
     ghc-options:       -Wall
   else
     buildable:         False
@@ -57,15 +57,15 @@ test-suite tests
   main-is:             TestSuite.hs
   other-modules:       TestParallelism, Internal
   type:                exitcode-stdio-1.0
-  build-depends:       base >=4.5 && <4.7,
+  build-depends:       base >=4.3 && <4.8,
                        json-rpc-server,
                        HUnit >=1.2 && <1.3,
                        test-framework >=0.7 && <0.9,
                        test-framework-hunit >=0.3 && <0.4,
-                       aeson >=0.6 && <0.8,
+                       aeson >=0.6 && <0.9,
                        bytestring >=0.9 && <0.11,
-                       mtl >=2.1 && <2.2,
+                       mtl >=1.1.1 && <2.3,
                        text >=0.11 && <1.2,
-                       vector >=0.8 && <0.11,
+                       vector >=0.7.1 && <0.11,
                        unordered-containers >=0.1 && <0.3
   ghc-options:         -Wall

src/Network/JsonRpc/Types.hs

@@ -3,6 +3,7 @@
              FlexibleInstances,
              UndecidableInstances,
              TypeOperators,
+             TypeSynonymInstances,
              OverloadedStrings #-}
 
 module Network.JsonRpc.Types ( RpcResult
@@ -27,7 +28,7 @@ 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 (when)
+import Control.Monad (mplus, when)
 import Control.Monad.Error (Error, ErrorT, throwError, strMsg, noMsg)
 import Prelude hiding (length)
 
@@ -61,7 +62,7 @@ instance (Monad m, Functor m, A.ToJSON r) => MethodParams (RpcResult m r) () m r
 instance (A.FromJSON a, MethodParams f p m r) => MethodParams (a -> f) (a :+: p) m r where
     apply f (param :+: ps) args = arg >>= \a -> apply (f a) ps nextArgs
         where arg = either (parseArg name) return =<<
-                    (Left <$> lookupValue <|> Right <$> paramDefault param)
+                    (Left <$> lookupValue) `mplus` (Right <$> paramDefault param)
               lookupValue = either (lookupArg name) (headArg name) args
               nextArgs = tailOrEmpty <$> args
               name = paramName param

tests/TestSuite.hs

@@ -184,5 +184,5 @@ removeErrMsg :: A.Value -> A.Value
 removeErrMsg (A.Object rsp) = A.Object $ H.adjust removeMsg "error" rsp
     where removeMsg (A.Object err) = A.Object $ H.insert "message" "" $ H.delete "data" err
           removeMsg v = v
-removeErrMsg (A.Array rsps) = A.Array $ removeErrMsg <$> rsps
+removeErrMsg (A.Array rsps) = A.Array $ removeErrMsg `V.map` rsps
 removeErrMsg v = v