v1.3.1.2: drop conditionals for GHC 7, allow newer containers

Author: andreasabel

.appveyor.yml

@@ -7,7 +7,6 @@ environment:
   matrix:
     - GHCVER: "8.2.2"
     - GHCVER: "8.0.2.2"
-    - GHCVER: "7.10.3.2"
 
 cache:
  - "C:\\SR"

.github/workflows/haskell-ci.yml

@@ -6,11 +6,11 @@
 #
 #   haskell-ci regenerate
 #
-# For more information, see https://github.com/andreasabel/haskell-ci
+# For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20240703
+# version: 0.19.20250216
 #
-# REGENDATA ("0.19.20240703",["github","hslogger.cabal"])
+# REGENDATA ("0.19.20250216",["github","hslogger.cabal"])
 #
 name: Haskell-CI
 on:
@@ -23,7 +23,7 @@ on:
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     timeout-minutes:
       60
     container:
@@ -32,14 +32,19 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.12.1
+            compilerKind: ghc
+            compilerVersion: 9.12.1
+            setup-method: ghcup
+            allow-failure: false
           - compiler: ghc-9.10.1
             compilerKind: ghc
             compilerVersion: 9.10.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.8.2
+          - compiler: ghc-9.8.4
             compilerKind: ghc
-            compilerVersion: 9.8.2
+            compilerVersion: 9.8.4
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.6.6
@@ -94,15 +99,29 @@ jobs:
             allow-failure: false
       fail-fast: false
     steps:
-      - name: apt
+      - name: apt-get install
         run: |
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
+      - name: Install GHCup
+        run: |
           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"
+          curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
-          "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+      - name: Install cabal-install
+        run: |
           "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+      - name: Install GHC (GHCup)
+        if: matrix.setup-method == 'ghcup'
+        run: |
+          "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+          HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
+          HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
+          HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
+          echo "HC=$HC" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -113,21 +132,12 @@ jobs:
           echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
           echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
           echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
-          HCDIR=/opt/$HCKIND/$HCVER
-          HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
-          HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
-          HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
-          echo "HC=$HC" >> "$GITHUB_ENV"
-          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
-          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
           echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
           echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
-          echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -204,6 +214,7 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package hslogger" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
+          allow-newer: containers
           EOF
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hslogger)$/; }' >> cabal.project.local
           cat cabal.project
@@ -242,9 +253,19 @@ jobs:
         run: |
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
+      - name: prepare for constraint sets
+        run: |
+          rm -f cabal.project.local
+      - name: constraint set containers-0.8
+        run: |
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.8' all --dry-run ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.8' --dependencies-only -j2 all ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.8' all ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.8' all ; fi
       - name: save cache
-        uses: actions/cache/save@v4
         if: always()
+        uses: actions/cache/save@v4
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store

.github/workflows/stack.yml

@@ -25,7 +25,7 @@ jobs:
           - resolver: 'nightly'
           - resolver: 'lts'
           - ghc: '9.6.6'
-            resolver: 'lts-22.34'
+            resolver: 'lts-22.43'
           - ghc: '9.4.8'
             resolver: 'lts-21.25'
           - ghc: '9.2.8'

CHANGELOG.md

@@ -1,16 +1,28 @@
-See also https://pvp.haskell.org/faq
+#### 1.3.1.2
 
-#### 1.3.1.1 *(patch)*
+_2025-03-11, Andreas Abel_
+
+- Thoroughly drop support for GHC 7
+- Allow newer `containers`
+- Tested with GHC 8.0 - 9.12.1
+
+#### 1.3.1.1
+
+_2024-04-15, Andreas Abel_
 
 - Drop support for GHC 7
 - Tested with GHC 8.0 - 9.10
 
-### 1.3.1.0 *(minor)*
+### 1.3.1.0
+
+_2019-10-07, Herbert Valerio Riedel_
 
 - Evaluate message before taking lock in simple handler ([#49](https://github.com/haskell-hvr/hslogger/pull/49))
 - Define `Typeable`, `Data`, `Generic` and `NFData` instances for `System.Log.Priority` ([#43](https://github.com/haskell-hvr/hslogger/pull/43))
 
-## 1.3.0.0 *(major)*
+## 1.3.0.0
+
+_2019-04-15, Herbert Valerio Riedel_
 
 - **[semantic change]** Messages are encoded as UTF-8 (previously the encoding was locale dependent) for the Syslog and Growl backends
 - Add support for `network-3.0`; remove redundant dependency on `directory` and `process`

Setup.hs

@@ -1,10 +1,10 @@
 branches: master
+ 
+constraint-set containers-0.8
+  ghc: >= 8.2
+  constraints: containers ^>= 0.8
+  tests: True
+  run-tests: True
 
--- constraint-set network-3.2
---   ghc: >= 8.0
---   constraints: network ^>= 3.2.0.0
---   tests: True
---   run-tests: True
---
--- raw-project
---   allow-newer: network
+raw-project
+  allow-newer: containers

cabal.haskell-ci

@@ -1,7 +1,7 @@
 cabal-version: 1.12
 build-type: Simple
 name: hslogger
-version: 1.3.1.1
+version: 1.3.1.2
 
 maintainer: https://github.com/haskell-hvr/hslogger
 author: John Goerzen
@@ -35,8 +35,9 @@ extra-source-files:
     testsrc/runtests.hs
 
 tested-with:
+  GHC == 9.12.1
   GHC == 9.10.1
-  GHC == 9.8.2
+  GHC == 9.8.4
   GHC == 9.6.6
   GHC == 9.4.8
   GHC == 9.2.8
@@ -75,21 +76,22 @@ library
     other-extensions: CPP ExistentialQuantification DeriveDataTypeable
 
     build-depends:
-        base       >= 4.9 && < 5
-      , bytestring >= 0.9 && < 0.13
-      , containers >= 0.4 && < 0.8
-      , deepseq    >= 1.1 && < 1.6
-      , time       >= 1.2 && < 1.15
-      , old-locale >= 1.0 && < 1.1
+      -- Lower bounds are chosen from LTS 7.24 (GHC 8.0.1)
+        base       >= 4.9      && < 5
+      , bytestring >= 0.10.8.1 && < 0.13
+      , containers >= 0.5.7.1  && < 1
+      , deepseq    >= 1.4.2.0  && < 1.6
+      , time       >= 1.6.0.1  && < 1.15
+      , old-locale >= 1.0.0.7  && < 1.1
 
     if flag(network--GT-3_0_0)
       build-depends: network-bsd >= 2.8.1 && <2.9,
                      network >= 3.0 && <3.3
     else
-      build-depends: network >= 2.6 && <2.9
+      build-depends: network >= 2.6.3.1 && <2.9
 
     if !os(windows)
-      Build-Depends: unix >= 2.4.2 && < 2.9
+      Build-Depends: unix >= 2.7.2.0 && < 2.9
 
 test-suite runtests
     type: exitcode-stdio-1.0

hslogger.cabal

@@ -1,9 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-
-#if __GLASGOW_HASKELL__ >= 702
 {-# LANGUAGE DeriveGeneric #-}
-#endif
 
 {- |
    Module     : System.Log
@@ -34,9 +31,7 @@ module System.Log(-- * Types
 
 import Control.DeepSeq (NFData(rnf))
 import Data.Data (Data, Typeable)
-#if __GLASGOW_HASKELL__ >= 702
 import  GHC.Generics (Generic)
-#endif
 
 {- | Priorities are used to define how important a log message is.
 Users can filter log messages based on priorities.
@@ -55,11 +50,7 @@ data Priority =
           | CRITICAL                -- ^ Severe situations
           | ALERT                   -- ^ Take immediate action
           | EMERGENCY               -- ^ System is unusable
-#if __GLASGOW_HASKELL__ >= 702
           deriving (Eq, Ord, Enum, Bounded, Show, Read, Data, Typeable, Generic)
-#else
-          deriving (Eq, Ord, Enum, Bounded, Show, Read, Data, Typeable)
-#endif
 
 -- | @since 1.3.1.0
 instance NFData Priority where rnf = (`seq` ())

src/System/Log.hs

@@ -30,11 +30,7 @@ import Control.Concurrent (myThreadId)
 import System.Posix.Process (getProcessID)
 #endif
 
-#if MIN_VERSION_time(1,5,0)
 import Data.Time.Format (defaultTimeLocale)
-#else
-import System.Locale (defaultTimeLocale)
-#endif
 import Data.Time (getZonedTime,getCurrentTime,formatTime)
 
 import System.Log

src/System/Log/Formatter.hs

@@ -107,11 +107,7 @@ module System.Log.Handler.Log4jXML (
 import Control.Concurrent (myThreadId)  -- myThreadId is GHC only!
 import Data.List (isPrefixOf)
 import System.IO
-#if MIN_VERSION_time(1,5,0)
 import Data.Time.Format (defaultTimeLocale)
-#else
-import System.Locale (defaultTimeLocale)
-#endif
 import Data.Time
 import System.Log
 import System.Log.Handler