diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 81f12c0..0907824 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,25 +12,25 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.4 - - uses: mrkkrp/ormolu-action@v2 + - uses: mrkkrp/ormolu-action@v5 build: runs-on: ubuntu-latest needs: ormolu strategy: matrix: - cabal: ["3.4"] - ghc: ["8.8.4", "8.10.5", "9.0.1"] + cabal: ["3.6"] + ghc: ["8.10.7", "9.0.1", "9.2.1"] env: CONFIG: "--enable-tests --enable-benchmarks --flags=dev" steps: - uses: actions/checkout@v2.3.4 - - uses: haskell/actions/setup@v1.2 + - uses: haskell/actions/setup@v1.2.7 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} cabal-version: ${{ matrix.cabal }} - - run: cabal v2-update - - run: cabal v2-freeze $CONFIG + - run: cabal update + - run: cabal freeze $CONFIG - uses: actions/cache@v2.1.3 with: path: | @@ -40,7 +40,7 @@ jobs: restore-keys: | ${{ runner.os }}-${{ matrix.ghc }}- - run: cabal format && git diff --exit-code --color=always - - run: cabal v2-build $CONFIG - - run: cabal v2-test $CONFIG - - run: cabal v2-haddock $CONFIG - - run: cabal v2-sdist + - run: cabal build $CONFIG + - run: cabal test $CONFIG + - run: cabal haddock $CONFIG + - run: cabal sdist diff --git a/req.cabal b/req.cabal index 6dd542b..6e9f7e8 100644 --- a/req.cabal +++ b/req.cabal @@ -1,11 +1,11 @@ -cabal-version: 1.18 +cabal-version: 2.4 name: req version: 3.9.2 -license: BSD3 +license: BSD-2-Clause license-file: LICENSE.md maintainer: Mark Karpov author: Mark Karpov -tested-with: ghc ==8.8.4 ghc ==8.10.5 ghc ==9.0.1 +tested-with: ghc ==8.10.7 ghc ==9.0.1 ghc ==9.2.1 homepage: https://github.com/mrkkrp/req bug-reports: https://github.com/mrkkrp/req/issues synopsis: HTTP client library @@ -43,13 +43,13 @@ library exceptions >=0.6 && <0.11, http-api-data >=0.2 && <0.5, http-client >=0.7 && <0.8, - http-client-tls >=0.3.2 && <0.4, + http-client-tls >=0.3.6 && <0.4, http-types >=0.8 && <10.0, modern-uri >=0.3 && <0.4, monad-control >=1.0 && <1.1, mtl >=2.0 && <3.0, retry >=0.8 && <0.10, - template-haskell >=2.14 && <2.18, + template-haskell >=2.14 && <2.19, text >=0.2 && <1.3, time >=1.2 && <1.13, transformers >=0.4 && <0.6, @@ -89,7 +89,7 @@ test-suite pure-tests mtl >=2.0 && <3.0, req, retry >=0.8 && <0.10, - template-haskell >=2.14 && <2.18, + template-haskell >=2.14 && <2.19, text >=0.2 && <1.3, time >=1.2 && <1.13