bump base upper bound

awkward-squad · May 16, 2024 · 36962d2 · 36962d2
1 parent f1efbb8
commit 36962d2
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 37 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/haskell-CI/haskell-ci
 #
-# version: 0.17.20231010
+# version: 0.19.20240513
 #
-# REGENDATA ("0.17.20231010",["github","text-ansi.cabal"])
+# REGENDATA ("0.19.20240513",["github","text-ansi.cabal"])
 #
 name: Haskell-CI
 on:
@@ -23,24 +23,24 @@ jobs:
     timeout-minutes:
       60
     container:
-      image: buildpack-deps:bionic
+      image: buildpack-deps:jammy
     continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.8.1
+          - compiler: ghc-9.10.1
             compilerKind: ghc
-            compilerVersion: 9.8.1
+            compilerVersion: 9.10.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.6.3
+          - compiler: ghc-9.8.2
             compilerKind: ghc
-            compilerVersion: 9.6.3
+            compilerVersion: 9.8.2
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.4.7
+          - compiler: ghc-9.6.5
             compilerKind: ghc
-            compilerVersion: 9.4.7
+            compilerVersion: 9.6.5
             setup-method: ghcup
             allow-failure: false
       fail-fast: false
@@ -50,10 +50,10 @@ jobs:
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           mkdir -p "$HOME/.ghcup/bin"
-          curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
+          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" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -71,7 +71,7 @@ jobs:
           echo "HC=$HC" >> "$GITHUB_ENV"
           echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
           echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.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"
@@ -128,7 +128,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
           cabal-plan --version
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
       - name: initial cabal.project for sdist
@@ -164,7 +164,7 @@ jobs:
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
           cabal-plan
       - name: restore cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store
@@ -191,7 +191,7 @@ jobs:
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
       - name: save cache
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: always()
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
-## [0.3.0.1] - 2023-10-12
+## [0.3.0.1] - October 12, 2023
 
 - Fix broken links to ECMA-48 standard
 
-## [0.3.0] - 2023-09-24
+## [0.3.0] - September 24, 2023
 
 - Switch the underlying text builder from `text-builder` to `text-builder-linear`. This also affects the API provided by
   `Text.Builder.ANSI`; users that were relying on the `Buidler` type from `text-builder` specificially are encouraged
@@ -12,33 +12,33 @@
   The motivation for this change is performance and encoraging the ecosystem to move in the right direction. See the
   `text-builder-linear` project for more details. In a nutshell, it is the superior builder type ;)
 
-## [0.2.1.1] - 2023-05-11
+## [0.2.1.1] - May 11, 2023
 
 - [#6](https://github.com/awkward-squad/text-ansi/pull/6) Fix Windows linker errors on GHC 9.4.5+
 
-## [0.2.1] - 2022-11-05
+## [0.2.1] - November 5, 2022
 
 - Add `String.ANSI` module
 
-## [0.2.0] - 2022-10-28
+## [0.2.0] - October 28, 2022
 
 - Drop the `Data` prefix from `Data.Text.ANSI` and `Data.Text.Builder.ANSI` modules
 - Rename `Text.Builder.ANSI` to `Text.Lazy.Builder.ANSI`
 - Add `Text.Builder.ANSI` back, but based on `text-builder`'s builder instead of `text`'s builder
 
-## [0.1.1] - 2021-01-07
+## [0.1.1] - January 7, 2021
 
 - Add `Data.Text.Builder.ANSI` module
 
-## [0.1.0.2] - 2020-12-26
+## [0.1.0.2] - December 26, 2020
 
 - Fix bug in `italic`
 
-## [0.1.0.1] - 2020-06-14
+## [0.1.0.1] - June 14, 2020
 
 - Relax `base` bounds
 - Drop `text-builder` dependency
 
-## [0.1.0] - 2018-11-14
+## [0.1.0] - November 14, 2018
 
 - Initial release
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2018-2022 Mitchell Rosen
+Copyright 2018-2024 Mitchell Dalvi Rosen
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

diff --git a/text-ansi.cabal b/text-ansi.cabal
@@ -1,9 +1,20 @@
 cabal-version: 2.2
 
-name: text-ansi
-version: 0.3.0.1
+author: Mitchell Dalvi Rosen, Travis Staton
+bug-reports: https://github.com/awkward-squad/text-ansi/issues
+build-type: Simple
 category: Data
+copyright: (c) 2018-2024 Mitchell Dalvi Rosen, Travis Staton
+homepage: https://github.com/awkward-squad/text-ansi
+license-file: LICENSE
+license: BSD-3-Clause
+maintainer: Mitchell Dalvi Rosen <[email protected]>, Travis Staton <[email protected]>
+name: text-ansi
 synopsis: Text styling for ANSI terminals.
+tested-with: GHC == 9.6.5, GHC == 9.8.2, GHC == 9.10.1
+version: 0.3.0.1
+x-revision: 1
+
 description:
   Text styling for ANSI terminals using SGR codes, as defined by the
   <https://www.ecma-international.org/publications-and-standards/standards/ecma-48 ECMA-48>
@@ -15,15 +26,6 @@ description:
   .
   Also features terminal detection, so redirecting styled output to a file will
   automatically strip the ANSI escape sequences.
-author: Mitchell Rosen, Travis Staton
-maintainer: Mitchell Rosen <[email protected]>, Travis Staton <[email protected]>
-homepage: https://github.com/awkward-squad/text-ansi
-bug-reports: https://github.com/awkward-squad/text-ansi/issues
-copyright: (c) 2018-2023 Mitchell Rosen, Travis Staton
-license: BSD-3-Clause
-license-file: LICENSE
-build-type: Simple
-tested-with: GHC == 9.4.7, GHC == 9.6.3, GHC == 9.8.1
 
 extra-source-files:
   CHANGELOG.md
@@ -35,7 +37,7 @@ source-repository head
 
 library
   build-depends:
-    base ^>= 4.16 || ^>= 4.17 || ^>= 4.18 || ^>= 4.19,
+    base ^>= 4.16 || ^>= 4.17 || ^>= 4.18 || ^>= 4.19 || ^>= 4.20,
     text >= 1.0 && < 2.2,
     text-builder-linear ^>= 0.1.1,
   default-language: