From 6973e248377dc58029f890b590bb29f787ca4a5e Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Thu, 26 Apr 2018 19:40:16 +0200 Subject: Bump aeson to 1.3 --- .circleci/release.sh | 2 +- stack.yaml | 7 ++----- stylish-haskell.cabal | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.circleci/release.sh b/.circleci/release.sh index 4643d39..05de9f1 100755 --- a/.circleci/release.sh +++ b/.circleci/release.sh @@ -4,7 +4,7 @@ set -o nounset -o errexit -o pipefail TAG="$1" SUFFIX="linux-$(uname -m)" USER="jaspervdj" -REPOSITORY="$(basename *.cabal ".cabal")" +REPOSITORY="$(basename -- *.cabal ".cabal")" BINARY="$REPOSITORY" echo "Tag: $TAG" diff --git a/stack.yaml b/stack.yaml index 0a3d7d6..ceda64e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,9 +1,6 @@ flags: {} packages: - '.' +resolver: lts-11.5 extra-deps: -- 'haskell-src-exts-1.20.1' -resolver: nightly-2017-12-14 -install-ghc: true -system-ghc: false -allow-newer: true +- 'aeson-1.3.1.0' diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal index f839c36..169775d 100644 --- a/stylish-haskell.cabal +++ b/stylish-haskell.cabal @@ -48,7 +48,7 @@ Library Paths_stylish_haskell Build-depends: - aeson >= 0.6 && < 1.3, + aeson >= 0.6 && < 1.4, base >= 4.8 && < 5, bytestring >= 0.9 && < 0.11, containers >= 0.3 && < 0.6, @@ -71,7 +71,7 @@ Executable stylish-haskell strict >= 0.3 && < 0.4, optparse-applicative >= 0.12 && < 0.15, -- Copied from regular dependencies... - aeson >= 0.6 && < 1.3, + aeson >= 0.6 && < 1.4, base >= 4.8 && < 5, bytestring >= 0.9 && < 0.11, containers >= 0.3 && < 0.6, -- cgit v1.2.3