From 281ff48c3ba197a46355bf2546d1e704e8df0a73 Mon Sep 17 00:00:00 2001
From: Dmitry Ivanov <ethercrow@gmail.com>
Date: Fri, 2 Jan 2015 15:39:11 +0600
Subject: [PATCH] Ask Travis to use GHC 7.10 too.

---
 .travis.yml          | 13 +++++++------
 Demo.hs              |  2 ++
 ci/travis_ci_install |  4 ++--
 ci/travis_ci_script  |  4 ++--
 vty.cabal            |  4 ++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4fe1a94..cbaaf6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,14 @@ notifications:
 
 matrix:
   allow_failures:
-    - env: GHCVER=head
+    - env: CABALVER=head GHCVER=head
 
 env:
- - GHCVER=7.4.2
- - GHCVER=7.6.3
- - GHCVER=7.8.2
- - GHCVER=head
+ - CABALVER=1.20 GHCVER=7.4.2
+ - CABALVER=1.20 GHCVER=7.6.3
+ - CABALVER=1.20 GHCVER=7.8.3
+ - CABALVER=1.22 GHCVER=7.10.1
+ - CABALVER=head GHCVER=head
 
 install:
   - ./ci/travis_ci_install
@@ -22,5 +23,5 @@ script:
 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-$CABALVER ghc-$GHCVER
  - export PATH=/opt/ghc/$GHCVER/bin:$PATH
diff --git a/Demo.hs b/Demo.hs
index bf8046c..29cf47a 100644
--- a/Demo.hs
+++ b/Demo.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE FlexibleContexts #-}
+
 module Main where
 
 import Graphics.Vty
diff --git a/ci/travis_ci_install b/ci/travis_ci_install
index d257745..f69d67c 100755
--- a/ci/travis_ci_install
+++ b/ci/travis_ci_install
@@ -2,8 +2,8 @@
 set -ex
 cabal --version
 if [[ "${GHCVER}" > "7.2.2" ]] ; then
-  /opt/cabal/1.20/bin/cabal install --only-dependencies --enable-tests
+  /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies --enable-tests
 else
-  /opt/cabal/1.20/bin/cabal install --only-dependencies
+  /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies
   echo "Skipping test dependency install on ${GHCVER}"
 fi
diff --git a/ci/travis_ci_script b/ci/travis_ci_script
index de4a4e6..de9ac4f 100755
--- a/ci/travis_ci_script
+++ b/ci/travis_ci_script
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -ex
 if [[ "${GHCVER}" > "7.2.2" ]] ; then
-  /opt/cabal/1.20/bin/cabal configure --enable-tests && /opt/cabal/1.20/bin/cabal build && /opt/cabal/1.20/bin/cabal test
+  /opt/cabal/${CABALVER}/bin/cabal configure --enable-tests && /opt/cabal/${CABALVER}/bin/cabal build && /opt/cabal/${CABALVER}/bin/cabal test
 else
   echo "Skipping tests on ${GHCVER}"
-  /opt/cabal/1.20/bin/cabal configure && /opt/cabal/1.20/bin/cabal build
+  /opt/cabal/${CABALVER}/bin/cabal configure && /opt/cabal/${CABALVER}/bin/cabal build
 fi
diff --git a/vty.cabal b/vty.cabal
index d69ef4c..2244c27 100644
--- a/vty.cabal
+++ b/vty.cabal
@@ -47,10 +47,10 @@ library
                        bytestring,
                        containers,
                        data-default >= 0.5.3,
-                       deepseq >= 1.1 && < 1.4,
+                       deepseq >= 1.1 && < 1.5,
                        directory,
                        filepath >= 1.0 && < 2.0,
-                       lens >= 3.9.0.2 && < 4.7,
+                       lens >= 3.9.0.2 && < 4.8,
                        -- required for nice installation with yi
                        hashable >= 1.2,
                        mtl >= 1.1.1.0 && < 2.3,