From 00a8e3b11f081454890a55e0698b9461677a2e9f Mon Sep 17 00:00:00 2001 From: Marco Z Date: Sat, 9 Mar 2024 21:03:12 +0100 Subject: [PATCH] Cleanup dependencies (#377) * remove upper bounds on text and bytestring * remove dep on transformers-compat * update CI to test against 9.8.2 as well --------- Co-authored-by: Marco Zocca --- .github/workflows/haskell-ci.yml | 4 ++-- changelog.md | 2 ++ scotty.cabal | 9 ++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index ea12833..ab10f5f 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -20,8 +20,8 @@ jobs: - { cabal: "3.10", os: ubuntu-latest, ghc: "9.0.2" } - { cabal: "3.10", os: ubuntu-latest, ghc: "9.2.8" } - { cabal: "3.10", os: ubuntu-latest, ghc: "9.4.6" } - - { cabal: "3.10", os: ubuntu-latest, ghc: "9.6.2" } - - { cabal: "3.10", os: ubuntu-latest, ghc: "9.6.3" } + - { cabal: "3.10", os: ubuntu-latest, ghc: "9.6.4" } + - { cabal: "3.10", os: ubuntu-latest, ghc: "9.8.2" } fail-fast: false steps: diff --git a/changelog.md b/changelog.md index 340c44f..ba6af5c 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,8 @@ ### Fixes * Path parameters with value matching the parameter name prefixed by colon will properly populate `pathParams` with their literal value : `/:param` will match `/:param` and add a `Param` with value `("param", ":param")` (#301) * Accept text-2.1 (#364) +* Remove dependency upper bounds on `text` and `bytestring` (#371) + ### Breaking changes * some ActionT API functions have now a MonadIO or MonadUnliftIO constraint rather than Monad reflecting that there is where request reading takes place. (#369) diff --git a/scotty.cabal b/scotty.cabal index ebbb0a0..365040c 100644 --- a/scotty.cabal +++ b/scotty.cabal @@ -46,8 +46,8 @@ tested-with: GHC == 8.10.7 , GHC == 9.0.2 , GHC == 9.2.8 , GHC == 9.4.6 - , GHC == 9.6.2 - , GHC == 9.6.3 + , GHC == 9.6.4 + , GHC == 9.8.2 Extra-source-files: README.md changelog.md @@ -73,7 +73,7 @@ Library build-depends: aeson >= 0.6.2.1 && < 2.3, base >= 4.14 && < 5, blaze-builder >= 0.3.3.0 && < 0.5, - bytestring >= 0.10.0.2 && < 0.13, + bytestring >= 0.10.0.2 , case-insensitive >= 1.0.0.1 && < 1.3, cookie >= 0.4, data-default-class >= 0.1, @@ -85,11 +85,10 @@ Library regex-compat >= 0.95.1 && < 0.96, resourcet, stm, - text >= 0.11.3.1 && < 2.2, + text >= 0.11.3.1 , time >= 1.8, transformers >= 0.3.0.0 && < 0.7, transformers-base >= 0.4.1 && < 0.5, - transformers-compat >= 0.4 && < 0.8, unliftio >= 0.2, wai >= 3.0.0 && < 3.3, wai-extra >= 3.1.14,