diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7967598..5f7815d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -244,8 +244,8 @@ jobs: strategy: fail-fast: false matrix: - cabal: ['2.4.1.0', '3.0.0.0', '3.2.0.0', '3.4.1.0', '3.6.2.0', '3.8.1.0', '3.10.3.0', '3.12.1.0'] - ghc: ['8.6.5'] + cabal: ['3.0.0.0', '3.2.0.0', '3.4.1.0', '3.6.2.0', '3.8.1.0', '3.10.3.0', '3.12.1.0'] + ghc: ['8.8.4'] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 124604a..079b9bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,9 +28,10 @@ following conventions: ### Breaking +* Remove support for GHC 8.6, constraining lower bounds * Remove support for GHC 8.4, constraining lower bounds * Remove support for GHC 8.2, constraining lower bounds -* Change minimal Cabal from 1.24 to 2.4 +* Change minimal Cabal from 1.24 to 3.0 ### Non-Breaking diff --git a/cabal-bounds-lower.project b/cabal-bounds-lower.project index 5a9343e..2e8101e 100644 --- a/cabal-bounds-lower.project +++ b/cabal-bounds-lower.project @@ -1,31 +1,31 @@ packages: ./redact.cabal -with-compiler: ghc-8.6.5 +with-compiler: ghc-8.8.4 constraints: -- https://hackage.haskell.org/package/ansi-terminal - ansi-terminal == 0.9.1 + ansi-terminal == 0.10.3 -- https://hackage.haskell.org/package/ansi-wl-pprint , ansi-wl-pprint == 0.6.9 -- https://hackage.haskell.org/package/base -- GHC boot library - , base == 4.12.0.0 + , base == 4.13.0.0 -- https://hackage.haskell.org/package/directory -- GHC boot library - , directory == 1.3.3.0 + , directory == 1.3.6.0 -- https://hackage.haskell.org/package/optparse-applicative - , optparse-applicative == 0.14.3.0 + , optparse-applicative == 0.15.1.0 -- https://hackage.haskell.org/package/tasty , tasty == 1.2.3 -- https://hackage.haskell.org/package/tasty-hunit - , tasty-hunit == 0.10.0.2 + , tasty-hunit == 0.10.0.3 -- https://hackage.haskell.org/package/text -- GHC boot library - , text == 1.2.3.1 + , text == 1.2.4.0 diff --git a/redact.cabal b/redact.cabal index 78f5384..d3eeacf 100644 --- a/redact.cabal +++ b/redact.cabal @@ -1,4 +1,4 @@ -cabal-version: 2.4 +cabal-version: 3.0 name: redact version: 0.5.0.0 synopsis: hide secret text on the terminal @@ -21,8 +21,7 @@ extra-doc-files: README.md tested-with: - GHC ==8.6.5 - || ==8.8.4 + GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 @@ -54,9 +53,9 @@ library autogen-modules: Paths_redact build-depends: - ansi-terminal >=0.9.1 && <1.2 - , base >=4.12.0.0 && <4.20 - , text >=1.2.3.1 && <2.2 + ansi-terminal >=0.10.3 && <1.2 + , base >=4.13.0.0 && <4.20 + , text >=1.2.4.0 && <2.2 default-language: Haskell2010 default-extensions: OverloadedStrings @@ -70,7 +69,7 @@ executable redact build-depends: ansi-terminal , base - , directory >=1.3.3.0 && <1.4 + , directory >=1.3.6.0 && <1.4 , redact if flag(optparse-applicative_ge_0_18) build-depends: @@ -79,7 +78,7 @@ executable redact else build-depends: ansi-wl-pprint >=0.6.9 && <1.1 - , optparse-applicative >=0.14.3.0 && <0.18 + , optparse-applicative >=0.15.1.0 && <0.18 default-language: Haskell2010 ghc-options: -Wall @@ -93,7 +92,7 @@ test-suite redact-test base , redact , tasty >=1.2.3 && <1.6 - , tasty-hunit >=0.10.0.2 && <0.11 + , tasty-hunit >=0.10.0.3 && <0.11 if impl(ghc >= 8.8.1) other-modules: Redact.Markdown.Mock diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml deleted file mode 100644 index eb02085..0000000 --- a/stack-8.6.5.yaml +++ /dev/null @@ -1,18 +0,0 @@ -resolver: lts-14.27 - -packages: - - . - -extra-deps: - - binary-0.8.6.0 - - constraints-0.13.2 - - containers-0.6.5.1 - - explainable-predicates-0.1.2.1 - - extra-1.7.10 - - HMock-0.5.1.0 - - regex-base-0.94.0.2 - - regex-tdfa-1.3.1.1 - - syb-0.7.2.1 - - text-1.2.5.0 - - type-equality-1 - - unliftio-0.2.20