diff --git a/.travis.yml b/.travis.yml index c9660a0..98f6280 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,10 +45,7 @@ install: - cabal install -v --avoid-reinstalls servant-blaze hspec-wai --constraint='foundation < 0.0.5' script: - - case "$CABALVER" in - "1.18") cabal configure --enable-tests --enable-library-coverage -v2 -f dev -f build-examples ;; - *) cabal configure --enable-tests --enable-coverage -v2 -f dev -f build-examples ;; - esac + - cabal configure --enable-tests --enable-library-coverage -v2 -f dev -f build-examples - cabal build - cabal test --show-details=always - cabal sdist diff --git a/servant-auth-cookie.cabal b/servant-auth-cookie.cabal index 8fbf0d4..74a5cf2 100644 --- a/servant-auth-cookie.cabal +++ b/servant-auth-cookie.cabal @@ -1,3 +1,4 @@ + name: servant-auth-cookie version: 0.6.0.3 synopsis: Authentication via encrypted cookies @@ -47,19 +48,19 @@ library build-depends: base >= 4.7 && < 5.0 , base64-bytestring - , blaze-builder >= 0.4 && < 0.4.1 + , blaze-builder >= 0.4 && < 0.4.2 , bytestring , cereal >= 0.5 && < 0.6 , cereal-time >= 0.1 && < 0.2 , cookie >= 0.4.1 && < 0.5 - , cryptonite >= 0.14 && < 0.25 + , cryptonite >= 0.14 && < 0.26 , data-default - , exceptions >= 0.8 && < 0.9 - , http-types >= 0.9 && < 0.12 + , exceptions >= 0.8 && < 0.11 + , http-types >= 0.9 && < 0.13 , memory >= 0.11 && < 0.15 , mtl >= 2.0 && < 3.0 - , servant >= 0.5 && < 0.13 - , servant-server >= 0.5 && < 0.13 + , servant >= 0.5 && < 0.16 + , servant-server >= 0.5 && < 0.16 , tagged == 0.8.* , text , time >= 1.6 && < 1.8.1 @@ -76,12 +77,12 @@ library if flag(servant9) build-depends: servant >= 0.9, - http-api-data == 0.3.* + http-api-data == 0.4.* else if flag(servant91) build-depends: servant >= 0.9, - http-api-data == 0.3.* + http-api-data == 0.4.* else build-depends: servant < 0.9, @@ -102,13 +103,13 @@ test-suite tests , QuickCheck >= 2.4 && < 3.0 , bytestring , cereal >= 0.5 && < 0.6 - , cryptonite >= 0.14 && < 0.25 + , cryptonite >= 0.14 && < 0.26 , data-default , deepseq >= 1.3 && < 1.5 , exceptions , hspec >= 2.0 && < 3.0 , servant-auth-cookie - , servant-server >= 0.5 && < 0.13 + , servant-server >= 0.5 && < 0.16 , tagged == 0.8.* , template-haskell , transformers >= 0.4 && < 0.6 @@ -128,18 +129,18 @@ executable example , blaze-markup >= 0.7 && < 0.9 , bytestring , cereal >= 0.5 && < 0.6 - , cryptonite >= 0.14 && < 0.25 + , cryptonite >= 0.14 && < 0.26 , data-default , directory , exceptions , filepath , http-media - , http-types >= 0.9 && < 0.12 + , http-types >= 0.9 && < 0.13 , mtl >= 2.0 && < 3.0 - , servant >= 0.5 && < 0.13 + , servant >= 0.5 && < 0.16 , servant-auth-cookie , servant-blaze >= 0.5 && < 0.8 - , servant-server >= 0.5 && < 0.13 + , servant-server >= 0.5 && < 0.16 , text , time , transformers >= 0.4 && < 0.6 @@ -148,7 +149,7 @@ executable example if flag(servant9) build-depends: servant >= 0.9, - http-api-data == 0.3.* + http-api-data == 0.4.* other-modules: AuthAPI FileKeySet @@ -185,20 +186,20 @@ test-suite example-tests , cereal >= 0.5 && < 0.6 , cookie , exceptions - , cryptonite >= 0.14 && < 0.25 + , cryptonite >= 0.14 && < 0.26 , data-default , deepseq >= 1.3 && < 1.5 , directory , filepath , http-media - , http-types >= 0.9 && < 0.12 + , http-types >= 0.9 && < 0.13 , hspec >= 2.0 && < 3.0 , hspec-wai , mtl >= 2.0 && < 3.0 , QuickCheck >= 2.4 && < 3.0 , servant-auth-cookie , servant-blaze >= 0.5 && < 0.8 - , servant-server >= 0.5 && < 0.13 + , servant-server >= 0.5 && < 0.16 , text , time >= 1.5 && < 1.8.1 , transformers >= 0.4 && < 0.6 @@ -207,12 +208,12 @@ test-suite example-tests if flag(servant9) build-depends: servant >= 0.9, - http-api-data == 0.3.* + http-api-data == 0.4.* else if flag(servant91) build-depends: servant >= 0.9.1, - http-api-data == 0.3.* + http-api-data == 0.4.* else build-depends: servant < 0.9, @@ -237,9 +238,9 @@ benchmark bench build-depends: base >= 4.7 && < 5.0 , bytestring , criterion >= 0.6.2.1 && < 1.4 - , cryptonite >= 0.14 && < 0.25 + , cryptonite >= 0.14 && < 0.26 , servant-auth-cookie - , servant-server >= 0.5 && < 0.13 + , servant-server >= 0.5 && < 0.16 if flag(dev) ghc-options: -Wall -Werror else diff --git a/stack.yaml b/stack.yaml index 35adf15..ee1a7e8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,3 @@ -resolver: lts-8.9 +resolver: lts-13.5 packages: - '.' -extra-deps: - - cereal-time-0.1.0.0