From baadb830bd4887b460e64fef0bd9145de0a5d386 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 25 Jun 2024 10:56:34 +0200 Subject: [PATCH] v0.0.1.3: drop support for GHC 7 --- .github/workflows/haskell-ci.yml | 28 ++++++---------------------- CHANGELOG.md | 7 +++++++ xor.cabal | 25 +++++++------------------ 3 files changed, 20 insertions(+), 40 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index d5e9a87..fa29101 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","xor.cabal"]) +# REGENDATA ("0.19.20240517",["github","xor.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 /^(xor)$/; }' >> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(xor)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b020d7..33109c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ +## 0.0.1.3 + +_Andreas Abel, 2024-06-25_ + +- Drop support for GHC 7. +- Tested with GHC 8.0 - 9.10. + ## 0.0.1.2 _Andreas Abel, 2023-07-19_ diff --git a/xor.cabal b/xor.cabal index 259412a..867da45 100644 --- a/xor.cabal +++ b/xor.cabal @@ -1,7 +1,6 @@ cabal-version: 2.2 name: xor -version: 0.0.1.2 -x-revision: 3 +version: 0.0.1.3 category: Data, Codec author: Herbert Valerio Riedel @@ -31,7 +30,7 @@ description: The performance is comparable to portable ISO C99 implementations but this library is implemented as pure Haskell and is thereby compatible with compile targets such as . tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.5 GHC == 9.4.8 @@ -43,7 +42,6 @@ tested-with: GHC == 8.4.4 GHC == 8.2.2 GHC == 8.0.2 - -- GHC == 7.10.3 extra-doc-files: CHANGELOG.md @@ -60,22 +58,13 @@ common defaults MagicHash build-depends: - , base >= 4.5 && < 5 + , base >= 4.9 && < 5 , bytestring >= 0.10.4 && < 0.13 , ghc-byteorder ^>= 4.11.0.0 - -- Andreas Abel, 2022-02-16: - -- There are build failures with bytestring-0.11 and GHC 7 - -- because the PS constructor was removed and retained as PatternSynonym - -- (for GHC 8 only, according to the release notes). - -- The following dependency rectifies this: - if !impl(ghc >= 8.0) - build-depends: - bytestring < 0.11 - - ghc-options: -Wall - if impl(ghc >= 8.0) - ghc-options: -Wcompat + ghc-options: + -Wall + -Wcompat library import: defaults @@ -115,5 +104,5 @@ test-suite test -- dependencies specific to this component , tasty >= 1.2.3 && < 1.6 , tasty-hunit ^>= 0.10 - , tasty-quickcheck ^>= 0.10 + , tasty-quickcheck >= 0.10 && < 1 , QuickCheck >= 2.14 && < 2.16