Merge pull request #1 from junjihashimoto/feature/ghc710

Modified cabal dependency for ghc710

.travis.yml

@@ -1,26 +1,22 @@
 env:
+  - GHCVER=7.10.1
   - GHCVER=7.8.4
 
 before_install:
   - sudo add-apt-repository -y ppa:hvr/ghc
   - sudo apt-get update
-  - sudo apt-get install cabal-install-1.20 ghc-$GHCVER
+  - sudo apt-get install cabal-install-1.22 ghc-$GHCVER
   - export PATH=/opt/ghc/$GHCVER/bin:$PATH
-  - |
-    if [ $GHCVER = "head" ] || [ ${GHCVER%.*} = "7.8" ]; then
-      sudo apt-get install happy-1.19.4 alex-3.1.3
-      export PATH=/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:$PATH
-    else
-      sudo apt-get install happy alex
-    fi
+  - sudo apt-get install happy-1.19.4 alex-3.1.3
+  - export PATH=/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:$PATH
 
 install:
-  - cabal-1.20 update
-  - cabal-1.20 install -j --only-dep  --enable-tests --force-reinstalls
+  - cabal-1.22 update
+  - cabal-1.22 install -j --only-dep  --enable-tests --force-reinstalls
 
 script:
-  - cabal-1.20 configure --enable-tests --enable-library-coverage && cabal-1.20 build && cabal-1.20 test
+  - cabal-1.22 configure --enable-tests --enable-library-coverage && cabal-1.22 build && cabal-1.22 test
 
 after_script:
-  - cabal-1.20 install hpc-coveralls --bindir=$HOME/.cabal/bin/
+  - cabal-1.22 install hpc-coveralls --bindir=$HOME/.cabal/bin/
   - $HOME/.cabal/bin/hpc-coveralls --exclude-dir=test test-memcache

ChangeLog.md

@@ -1,3 +1,3 @@
-## 0.0.10
+## 0.0.10.1
 
 * Add exptime-support to Network.Memcache.Client

memcache-haskell.cabal

@@ -1,11 +1,12 @@
 Name:           memcache-haskell
-Version:        0.0.10
-Description:    Memcache procotol library
+Version:        0.0.10.1
+Synopsis:       Memcache procotol library
 License:        MIT
 license-file:   LICENSE
 Author:         Kiyoshi Ikehara
 Maintainer:     Kiyoshi Ikehara
 Copyright:      (c) 2015 GREE, Inc.
+Category:       Network
 Build-Type:     Simple
 Cabal-Version:  >=1.8
 Description:
@@ -62,7 +63,7 @@ Executable memcache-sample-client
                  , resourcet
                  , mtl
                  , hashtables
-                 , network-conduit
+                 , conduit-extra
                  , memcache-haskell
   Hs-source-dirs:  sample
   Main-is:         sample-client.hs
@@ -83,7 +84,7 @@ Executable memcache-sample-retrieval
                  , resourcet
                  , mtl
                  , hashtables
-                 , network-conduit
+                 , conduit-extra
                  , memcache-haskell
   Hs-source-dirs:  sample
   Main-is:         sample-retrieval.hs
@@ -95,7 +96,7 @@ Test-Suite test-memcache
                  , bytestring
                  , network >= 2.3.2
                  , split
-                 , QuickCheck == 2.5.1.1
+                 , QuickCheck
                  , HUnit
                  , test-framework
                  , test-framework-th