From 2e89c3b33d0bfa87bdf5a30b6689fcc3e8a301f6 Mon Sep 17 00:00:00 2001
From: Bartosz Nitka <bnitka@fb.com>
Date: Mon, 24 Jul 2017 09:35:13 -0700
Subject: [PATCH] Test with GHC 8.2.1

Summary: GHC 8.2.1 has been released.

Reviewed By: JonCoens

Differential Revision: D5478409

fbshipit-source-id: e065ed3
---
 .travis.yml    |  7 +++----
 duckling.cabal | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6dacbd7f..1e419e6ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,10 +21,9 @@ matrix:
     - env: CABALVER=1.24 GHCVER=8.0.2
       compiler: ": #GHC 8.0.2"
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2,happy-1.19.5], sources: [hvr-ghc]}}
-    # blocked on https://github.com/ygale/timezone-olson/pull/4
-    # - env: CABALVER=1.24 GHCVER=8.2.1
-    #   compiler: ": #GHC 8.2.1"
-    #   addons: {apt: {packages: [cabal-install-1.24,ghc-8.2.1,happy-1.19.5], sources: [hvr-ghc]}}
+    - env: CABALVER=2.0 GHCVER=8.2.1
+      compiler: ": #GHC 8.2.1"
+      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1,happy-1.19.5], sources: [hvr-ghc]}}
 
 before_install:
  - unset CC
diff --git a/duckling.cabal b/duckling.cabal
index c57f557bb..53247f095 100644
--- a/duckling.cabal
+++ b/duckling.cabal
@@ -15,7 +15,8 @@ build-type:          Simple
 stability:           alpha
 cabal-version:       >=1.10
 tested-with:
-  GHC==8.0.2
+  GHC==8.0.2,
+  GHC==8.2.1
 
 extra-source-files:    README.md
                      , PATENTS
@@ -506,7 +507,7 @@ library
                      , regex-base            >= 0.93.2 && < 0.94
                      , regex-pcre            >= 0.94.4 && < 0.95
                      , text                  >= 1.2.2.1 && < 1.3
-                     , text-show             >= 2.1.2 && < 3.5
+                     , text-show             >= 2.1.2 && < 3.7
                      , time                  >= 1.5.0.1 && < 1.9
                      , timezone-series       >= 0.1.5.1 && < 0.2
                      , unordered-containers  >= 0.2.7.2 && < 0.3
@@ -756,6 +757,14 @@ executable duckling-request-sample
   build-depends:       duckling
                      , base
                      , dependent-sum
+                     , directory             >= 1.2.2.0 && < 1.4
+                     , extra
+                     , filepath              >= 1.4.0.0 && < 1.5
+                     , text
+                     , time
+                     , timezone-olson        >= 0.1.7 && < 0.2
+                     , timezone-series
+                     , unordered-containers
   default-language:    Haskell2010
   default-extensions:  OverloadedStrings
 
@@ -767,6 +776,14 @@ executable duckling-expensive
   build-depends:       duckling
                      , base
                      , dependent-sum
+                     , directory             >= 1.2.2.0 && < 1.4
+                     , extra
+                     , filepath              >= 1.4.0.0 && < 1.5
+                     , text
+                     , time
+                     , timezone-olson        >= 0.1.7 && < 0.2
+                     , timezone-series
+                     , unordered-containers
   default-language:    Haskell2010
   default-extensions:  OverloadedStrings