v0.0.0.2: drop support for GHC 7

haskell-hvr · Jun 25, 2024 · 56f8615 · 56f8615
1 parent 28d6712
commit 56f8615
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 34 deletions.
diff --git 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","brotli.cabal"])
+# REGENDATA ("0.19.20240517",["github","brotli.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)
           apt-get update
@@ -128,7 +127,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:
@@ -157,18 +156,6 @@ jobs:
           repository hackage.haskell.org
             url: http://hackage.haskell.org/
           EOF
-          if $HEADHACKAGE; then
-          cat >> $CABAL_CONFIG <<EOF
-          repository head.hackage.ghc.haskell.org
-             url: https://ghc.gitlab.haskell.org/head.hackage/
-             secure: True
-             root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-                        26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-                        f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-             key-threshold: 3
-          active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
-          EOF
-          fi
           cat >> $CABAL_CONFIG <<EOF
           program-default-options
             ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -220,10 +207,7 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
           EOF
-          if $HEADHACKAGE; then
-          echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
-          fi
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(brotli)$/; }' >> cabal.project.local
+          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(brotli)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
       - name: dump install plan

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,12 @@
 
+0.0.0.2
+-------
+
+_Andreas Abel, 2024-06-25_
+
+- Drop support for GHC 7.
+- Tested with GHC 8.0 - 9.10.
+
 0.0.0.1 revision 3
 ------------------
 

diff --git a/brotli.cabal b/brotli.cabal
@@ -1,8 +1,7 @@
 cabal-version:       1.12
 build-type:          Simple
 name:                brotli
-version:             0.0.0.1
-x-revision:          5
+version:             0.0.0.2
 
 synopsis:            Brotli (RFC7932) compression and decompression
 homepage:            https://github.com/haskell-hvr/brotli
@@ -32,7 +31,7 @@ description:
     .
 
 tested-with:
-  GHC == 9.10.0
+  GHC == 9.10.1
   GHC == 9.8.2
   GHC == 9.6.5
   GHC == 9.4.8
@@ -44,7 +43,6 @@ tested-with:
   GHC == 8.4.4
   GHC == 8.2.2
   GHC == 8.0.2
-  -- GHC == 7.10.3
 
 extra-source-files:
   CHANGELOG.md
@@ -59,7 +57,7 @@ library
   exposed-modules:     Codec.Compression.Brotli
   other-modules:       LibBrotli
 
-  build-depends:       base         >=4.5     && <5
+  build-depends:       base         >=4.9     && <5
                      , bytestring   >=0.9.2   && <0.13
                      , transformers >=0.3.0.0 && <0.7
 
@@ -70,9 +68,9 @@ library
 
   include-dirs:        cbits
 
-  ghc-options:         -Wall
-  if impl(ghc >= 8.0)
-    ghc-options:       -Wcompat
+  ghc-options:
+    -Wall
+    -Wcompat
 
 test-suite brotli-tests
   default-language:    Haskell2010
@@ -90,8 +88,10 @@ test-suite brotli-tests
                      , QuickCheck                  >= 2.14    && < 2.16
                      , tasty                       >= 1.2     && < 1.6
                      , tasty-hunit                 == 0.10.*
-                     , tasty-quickcheck            == 0.10.*
+                     , tasty-quickcheck            >= 0.10    && < 1
 
-  ghc-options:         -Wall -threaded
-  if impl(ghc >= 8.0)
-    ghc-options:       -Wcompat
+
+  ghc-options:
+    -threaded
+    -Wall
+    -Wcompat