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 0dc672d..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 @@ -122,16 +121,16 @@ 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 + base , aeson - , attoparsec >= 0.10 + , attoparsec , authenticate-oauth , bytestring , case-insensitive , conduit - , conduit-extra >= 1.1 + , conduit-extra , containers , data-default , hspec @@ -139,14 +138,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 +164,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