From 4a915bdab3f1842a9c5f8cd9b75a0c518913c2f2 Mon Sep 17 00:00:00 2001
From: Takahiro HIMURA <taka@himura.jp>
Date: Sat, 26 Oct 2019 00:25:22 +0900
Subject: [PATCH 1/3] Relax hspec-discover version restriction

---
 twitter-conduit.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twitter-conduit.cabal b/twitter-conduit.cabal
index 0dc672d..6c47ed2 100644
--- a/twitter-conduit.cabal
+++ b/twitter-conduit.cabal
@@ -122,7 +122,7 @@ test-suite spec_main
   if flag(run-integrated-test)
     CPP-Options: -DRUN_INTEGRATED_TEST
 
-  build-tool-depends: hspec-discover:hspec-discover >= 2.3.0 && < 2.5
+  build-tool-depends: hspec-discover:hspec-discover >= 2.3.0
   build-depends:
       base >= 4.5 && < 5
     , aeson

From a258d8d2b225d1178cbbdca4278291fec64c71d5 Mon Sep 17 00:00:00 2001
From: Takahiro HIMURA <taka@himura.jp>
Date: Sat, 26 Oct 2019 01:01:18 +0900
Subject: [PATCH 2/3] Remove version restriction from test

because it is already specified in the library build-depends
---
 twitter-conduit.cabal | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/twitter-conduit.cabal b/twitter-conduit.cabal
index 6c47ed2..8628899 100644
--- a/twitter-conduit.cabal
+++ b/twitter-conduit.cabal
@@ -124,14 +124,14 @@ test-suite spec_main
 
   build-tool-depends: hspec-discover:hspec-discover >= 2.3.0
   build-depends:
-      base >= 4.5 && < 5
+      base
     , aeson
-    , attoparsec >= 0.10
+    , attoparsec
     , authenticate-oauth
     , bytestring
     , case-insensitive
     , conduit
-    , conduit-extra >= 1.1
+    , conduit-extra
     , containers
     , data-default
     , hspec
@@ -139,14 +139,14 @@ test-suite spec_main
     , http-conduit
     , http-types
     , lens
-    , lens-aeson >= 1
+    , lens-aeson
     , resourcet
     , template-haskell
     , text
     , time
     , twitter-conduit
-    , twitter-types >= 0.6
-    , twitter-types-lens >= 0.6
+    , twitter-types
+    , twitter-types-lens
 
   if flag(network-uri)
     build-depends: network-uri >= 2.6
@@ -165,6 +165,6 @@ test-suite spec_main
 
 custom-setup
   setup-depends:
-    base >= 4.5 && <5,
-    Cabal >= 1.24,
-    cabal-doctest >= 1 && < 1.1
+      base
+    , Cabal >= 1.24
+    , cabal-doctest >= 1 && < 1.1

From 5efb1ecae335450c8123256cad5c91b4bfb38a10 Mon Sep 17 00:00:00 2001
From: Takahiro HIMURA <taka@himura.jp>
Date: Sat, 26 Oct 2019 01:09:15 +0900
Subject: [PATCH 3/3] Remove unused test file

---
 .travis/check-sdist.sh | 25 -------------------------
 twitter-conduit.cabal  |  1 -
 2 files changed, 26 deletions(-)
 delete mode 100755 .travis/check-sdist.sh

diff --git a/.travis/check-sdist.sh b/.travis/check-sdist.sh
deleted file mode 100755
index aa3b817..0000000
--- a/.travis/check-sdist.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-BASEDIR="$PWD"
-TARGET="$1"
-DIST="$(stack path | awk '/^dist-dir/ {print $2}')"
-
-stack sdist
-
-if [ ! -f ${DIST%/}/${TARGET}-*.tar.gz ]; then
-    echo "NG: missing archive"
-    exit 1
-fi
-
-cd "$DIST"
-srctgz=(${TARGET}*.tar.gz)
-srctgz="${srctgz[0]}"
-pkgname="${srctgz%.tar.gz}"
-tar xvzf "${srctgz}"
-cd "$BASEDIR"
-NG=$(git ls-tree -r HEAD | while read perm blob hash name; do [ -e "$DIST/$pkgname/$name" ] || echo "$name"; done)
-if [ -n "$NG" ]; then
-    echo "Missing files:"
-    echo $NG
-    exit 1
-fi
diff --git a/twitter-conduit.cabal b/twitter-conduit.cabal
index 8628899..1de9800 100644
--- a/twitter-conduit.cabal
+++ b/twitter-conduit.cabal
@@ -26,7 +26,6 @@ description:
 extra-source-files:
   .gitignore
   .travis.yml
-  .travis/*.sh
   README.md
   ChangeLog.md
   Warning.hs