diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 89abd2f..e506543 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -13,7 +13,7 @@ jobs: build: strategy: matrix: - ghc: ['8.10.7', '9.2.6', '9.4.8'] + ghc: ['8.10.7', '9.2.6', '9.4.8', '9.6.3', '9.8.1'] fail-fast: false runs-on: ubuntu-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index f71e8ad..cc69413 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for configurator-pg +## 0.2.9 -- 2023-12-07 + +* Allow text-2.1 and GHC 9.8. + ## 0.2.8 -- 2023-12-07 * Allow megaparsec-9.5 and GHC 9.4.8. diff --git a/cabal.project b/cabal.project index 154f17c..67650d1 100644 --- a/cabal.project +++ b/cabal.project @@ -1,7 +1,6 @@ packages: . -allow-newer: - -- https://github.com/protolude/protolude/pull/141 - protolude:base, - protolude:ghc-prim, - -- https://github.com/simonmar/async/issues/133 - async:base + +-- Required only because 'cabal test' needs this with ghc-9.8; +-- try removing cabal.project in the future. +tests: True + diff --git a/configurator-pg.cabal b/configurator-pg.cabal index bcf8304..9393e3a 100644 --- a/configurator-pg.cabal +++ b/configurator-pg.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: configurator-pg -version: 0.2.8 +version: 0.2.9 synopsis: Reduced parser for configurator-ng config files description: This module provides a simplified and updated interface to the @@ -33,12 +33,12 @@ library Data.Configurator.Parser Data.Configurator.Syntax Data.Configurator.Types - build-depends: base >= 4.9 && < 4.18 + build-depends: base >= 4.9 && < 4.20 , megaparsec >= 7.0.0 && < 9.6 , containers >= 0.5.6.2 && < 0.7 , protolude >= 0.1.10 && < 0.4 , scientific >= 0.3.4.9 && < 0.4 - , text >= 1.2.2.2 && < 2.1 + , text >= 1.2.2.2 && < 2.2 hs-source-dirs: src default-language: Haskell2010 default-extensions: OverloadedStrings, NoImplicitPrelude @@ -48,7 +48,7 @@ test-suite tests type: exitcode-stdio-1.0 main-is: Test.hs hs-source-dirs: tests - build-depends: base >= 4.9 && < 4.18 + build-depends: base >= 4.9 && < 4.20 , configurator-pg , HUnit >= 1.3.1.2 && < 1.7 , bytestring >= 0.10.6 && < 0.12 @@ -56,7 +56,7 @@ test-suite tests , protolude >= 0.1.10 && < 0.4 , test-framework >= 0.8.1.1 && < 0.9 , test-framework-hunit >= 0.3.0.2 && < 0.4 - , text >= 1.2.2.2 && < 2.1 + , text >= 1.2.2.2 && < 2.2 default-language: Haskell2010 default-extensions: OverloadedStrings, NoImplicitPrelude ghc-options: -Wall