From 9bd025bf01ee3b9fc9f1f63371cb42a41132d31e Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Sun, 19 May 2024 05:54:45 +0000 Subject: [PATCH 1/5] Bump upper dependency bound on `base`. --- monoidmap.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monoidmap.cabal b/monoidmap.cabal index 47cefcc..45d83ac 100644 --- a/monoidmap.cabal +++ b/monoidmap.cabal @@ -17,7 +17,7 @@ extra-doc-files: README.md common dependency-base - build-depends:base >= 4.14.3.0 && < 4.20 + build-depends:base >= 4.14.3.0 && < 4.21 common dependency-containers build-depends:containers >= 0.6.5.1 && < 0.8 common dependency-deepseq From a523d5124313ac237b33e0486c2e7ca734523add Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Sun, 19 May 2024 05:55:13 +0000 Subject: [PATCH 2/5] Organise imports in `MonoidMap.ClassSpec`. --- src/test/Data/MonoidMap/ClassSpec.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/Data/MonoidMap/ClassSpec.hs b/src/test/Data/MonoidMap/ClassSpec.hs index 53e762f..806d304 100644 --- a/src/test/Data/MonoidMap/ClassSpec.hs +++ b/src/test/Data/MonoidMap/ClassSpec.hs @@ -25,10 +25,10 @@ import GHC.Exts ( IsList (..) ) import Numeric.Natural ( Natural ) -import Test.Hspec - ( Spec, describe ) import Test.Combinators.NonZero ( NonZero, genNonZero, shrinkNonZero ) +import Test.Hspec + ( Spec, describe ) import Test.QuickCheck ( Arbitrary (..), listOf, scale, shrinkMapBy ) import Test.QuickCheck.Classes From 5716df57476b55fb6876cec9d1e308697985b54e Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Sun, 19 May 2024 05:55:34 +0000 Subject: [PATCH 3/5] Stop importing implicitly from `Prelude`. --- src/benchmark/Main.hs | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/benchmark/Main.hs b/src/benchmark/Main.hs index 2896a4a..722830c 100644 --- a/src/benchmark/Main.hs +++ b/src/benchmark/Main.hs @@ -4,19 +4,28 @@ module Main where -import Prelude hiding - ( lookup ) - import Control.DeepSeq ( rnf ) import Control.Exception ( evaluate ) +import Data.Eq + ( Eq ) +import Data.Function + ( flip, ($) ) +import Data.Int + ( Int ) import Data.List - ( foldl' ) + ( foldl', zip ) import Data.Maybe - ( fromMaybe ) + ( Maybe, fromMaybe ) +import Data.Ord + ( Ord ) import Data.Semigroup - ( stimes ) + ( Semigroup ((<>)), stimes ) +import Prelude + ( Integer, Num, (^) ) +import System.IO + ( IO ) import Test.Tasty.Bench ( bench, bgroup, defaultMain, nf ) From 9ad39dd108cfabbb63d6aecb5f0b9c1abe864ceb Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Sun, 19 May 2024 05:57:05 +0000 Subject: [PATCH 4/5] Add GHC version `9.10` to CI build matrix. --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12d37e1..b995e41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,7 @@ jobs: - '9.4' - '9.6' - '9.8' + - '9.10' exclude: # TODO: https://github.com/haskell-actions/setup/issues/77 # To work around the above issue, we exclude the following versions: @@ -115,7 +116,7 @@ jobs: if: | github.ref == 'refs/heads/main' && matrix.os == 'ubuntu-latest' - && matrix.ghc == '9.8' + && matrix.ghc == '9.10' run: > mv ${{ env.cabal-build-dir }}/build/*/*/*/doc/html/* gh-pages @@ -125,7 +126,7 @@ jobs: if: | github.ref == 'refs/heads/main' && matrix.os == 'ubuntu-latest' - && matrix.ghc == '9.8' + && matrix.ghc == '9.10' uses: JamesIves/github-pages-deploy-action@v4 with: branch: gh-pages From 9b08366e29ec9188c7cbc57f28d8e6cd155bb8e4 Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Sun, 19 May 2024 05:57:30 +0000 Subject: [PATCH 5/5] Bump package version. --- CHANGELOG.md | 4 ++++ monoidmap.cabal | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90c914d..c8edc9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.0.1.4 + +- Added support for GHC 9.10. + # 0.0.1.3 - Updated version bounds for dependencies. diff --git a/monoidmap.cabal b/monoidmap.cabal index 45d83ac..cbb89aa 100644 --- a/monoidmap.cabal +++ b/monoidmap.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: monoidmap -version: 0.0.1.3 +version: 0.0.1.4 bug-reports: https://github.com/jonathanknowles/monoidmap/issues license: Apache-2.0 license-file: LICENSE