diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 7813ed7..024f6d3 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/andreasabel/haskell-ci # -# version: 0.19.20240422 +# version: 0.19.20240517 # -# REGENDATA ("0.19.20240422",["github","microaeson.cabal"]) +# REGENDATA ("0.19.20240517",["github","microaeson.cabal"]) # name: Haskell-CI on: @@ -32,9 +32,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.10.0.20240413 + - compiler: ghc-9.10.1 compilerKind: ghc - compilerVersion: 9.10.0.20240413 + compilerVersion: 9.10.1 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.2 @@ -101,7 +101,6 @@ jobs: mkdir -p "$HOME/.ghcup/bin" curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml; "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: @@ -126,7 +125,7 @@ jobs: echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi + echo "HEADHACKAGE=false" >> "$GITHUB_ENV" echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" echo "GHCJSARITH=0" >> "$GITHUB_ENV" env: @@ -155,18 +154,6 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF - if $HEADHACKAGE; then - cat >> $CABAL_CONFIG <> $CABAL_CONFIG <= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project - fi - $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(microaeson)$/; }' >> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(microaeson)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/CHANGELOG.md b/CHANGELOG.md index bab5916..2b4463b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +### 0.1.0.2 + +_Andreas Abel, 2024-06-25_ + +- Drop support for GHC 7. +- Tested with GHC 8.0 - 9.10. + + ### 0.1.0.1 _Andreas Abel, 2022-05-26_ diff --git a/microaeson.cabal b/microaeson.cabal index b0cba99..8d6df15 100644 --- a/microaeson.cabal +++ b/microaeson.cabal @@ -1,7 +1,6 @@ cabal-version: 2.0 name: microaeson -version: 0.1.0.1 -x-revision: 9 +version: 0.1.0.2 synopsis: A tiny JSON library with light dependency footprint license: GPL-3 @@ -21,7 +20,7 @@ The API is designed in such a way to allow to easily convert client code written } tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.5 GHC == 9.4.8 @@ -33,7 +32,6 @@ tested-with: GHC == 8.4.4 GHC == 8.2.2 GHC == 8.0.2 - -- GHC == 7.10.3 extra-source-files: CHANGELOG.md @@ -74,13 +72,14 @@ library build-tool-depends: alex:alex >= 3.2.0 - ghc-options: -Wall + ghc-options: + -Wall + -Wcompat + -Wnoncanonical-monad-instances - if impl(ghc >= 8.0) - ghc-options: -Wcompat -Wnoncanonical-monad-instances - - if impl(ghc < 8.8) - ghc-options: -Wnoncanonical-monadfail-instances + if impl(ghc < 8.8) + ghc-options: + -Wnoncanonical-monadfail-instances test-suite microaeson default-language: Haskell2010 @@ -109,15 +108,17 @@ test-suite microaeson , QuickCheck >= 2.11.3 && < 2.16 , quickcheck-instances ^>= 0.3.16 , tasty >= 1.0.1.1 && < 1.6 - , tasty-quickcheck ^>= 0.10 + , tasty-quickcheck >= 0.10 && < 1 , unordered-containers ^>= 0.2.8.0 , vector ^>= 0.12.0.1 || ^>= 0.13.0.0 - ghc-options: -Wall - if impl(ghc >= 8.0) - ghc-options: -Wcompat -Wnoncanonical-monad-instances + ghc-options: + -Wall + -Wcompat + -Wnoncanonical-monad-instances - if impl(ghc < 8.8) - ghc-options: -Wnoncanonical-monadfail-instances + if impl(ghc < 8.8) + ghc-options: + -Wnoncanonical-monadfail-instances