diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +0.2.7.2 (2023-03-19): + * Technical Debt: + - Updated for GHC 9.6 0.2.7.1 (2022-08-28): * Technical Debt: - Updated for GHC 9.4 diff --git a/bytestring-trie.cabal b/bytestring-trie.cabal --- a/bytestring-trie.cabal +++ b/bytestring-trie.cabal @@ -6,18 +6,18 @@ -- ---------------------------------------------------------------- --- wren gayle romano ~ 2022.08.28 +-- wren gayle romano ~ 2023-03-19 ---------------------------------------------------------------- Name: bytestring-trie -Version: 0.2.7.1 +Version: 0.2.7.2 Build-Type: Simple Stability: provisional Homepage: https://wrengr.org/software/hackage.html Bug-Reports: https://github.com/wrengr/bytestring-trie/issues Author: wren gayle romano Maintainer: wren@cpan.org -Copyright: 2008–2022 wren gayle romano +Copyright: 2008–2023 wren gayle romano -- Cabal-2.2 requires us to say "BSD-3-Clause" not "BSD3" License: BSD-3-Clause License-File: LICENSE @@ -58,20 +58,24 @@ GHC ==8.10.3, GHC ==9.0.1, GHC ==9.2.4, - GHC ==9.4.1 + GHC ==9.4.4, + GHC ==9.6.1 + -- These are the versions of our dependencies which ship with the -- above. Alas, we can't merge this with the above because cabal -- files only have full-line comments, not end-of-line comments. -- --- GHC Cabal base bytestring binary deepseq --- 8.0 1.24 4.9 0.10.8.1 0.8.3.0 1.4.2.0 --- 8.2 2.0 4.10 0.10.8.2 0.8.5.1 1.4.3.0 --- 8.4 2.2 4.11 == == == --- 8.6 2.4 4.12 == 0.8.6.0 1.4.4.0 --- 8.8 3.0 4.13 0.10.9+ 0.8.7.0 == --- 8.10 3.2 4.14 0.10.10+ 0.8.8.0 == --- 9.0 3.4 4.15 0.10.12 == 1.4.5.0 --- 9.2 3.6 4.16 0.11.1 0.8.9.0 1.4.6.0 +-- GHC Cabal base bytestring binary deepseq +-- 8.0 1.24 4.9 0.10.8.1 0.8.3.0 1.4.2.0 +-- 8.2 2.0 4.10 0.10.8.2 0.8.5.1 1.4.3.0 +-- 8.4 2.2 4.11 == == == +-- 8.6 2.4 4.12 == 0.8.6.0 1.4.4.0 +-- 8.8 3.0 4.13 0.10.9+ 0.8.7.0 == +-- 8.10 3.2 4.14 0.10.10+ 0.8.8.0 == +-- 9.0 3.4 4.15 0.10.12 == 1.4.5.0 +-- 9.2 3.6 4.16 0.11.1 0.8.9.0 1.4.6.0 +-- 9.4 3.8.1 4.17 0.11.3.1 0.8.9.1 1.4.8.0 +-- 9.6 3.10.1 4.18 0.11.4 == 1.4.8.1 Source-Repository head Type: git @@ -94,7 +98,7 @@ -- we verified (for GHC 7.4.1). We no longer maintain CI tests -- that far back, but they still seem to work according to Hackage: -- - Build-Depends: base >= 4.5 && < 4.18 + Build-Depends: base >= 4.5 && < 4.19 , bytestring >= 0.9.2 && < 0.12 , binary >= 0.5.1 && < 0.11 , deepseq >= 1.2 && < 1.5 @@ -170,6 +174,11 @@ -- BUG: @gauge@ depends on @basement@ which as of -- version 0.0.12 doesn't support GHC 9.2; so we'll -- have to revisit this later. + -- + -- NOTE: If you're having issues building on ghc-9.6, + -- then be sure to update your cabal info. + -- The parallel-3.2.2.0 package has metadata revisions + -- to allow building with base-4.18. , criterion , QuickCheck >= 2.10 && < 2.15 diff --git a/dev/Bench/Foldable.hs b/dev/Bench/Foldable.hs --- a/dev/Bench/Foldable.hs +++ b/dev/Bench/Foldable.hs @@ -5,7 +5,7 @@ -- ~ 2022.03.04 -- | -- Module : Bench.Foldable --- Copyright : 2008--2022 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional diff --git a/dev/Bench/MatchOne.hs b/dev/Bench/MatchOne.hs --- a/dev/Bench/MatchOne.hs +++ b/dev/Bench/MatchOne.hs @@ -2,10 +2,10 @@ {-# LANGUAGE CPP, BangPatterns #-} ---------------------------------------------------------------- --- ~ 2022.02.12 +-- ~ 2023.03.19 -- | -- Module : Bench.MatchOne --- Copyright : 2008--2022 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional @@ -19,7 +19,10 @@ import qualified Data.Trie as T import qualified Data.Trie.Internal as TI import qualified Data.ByteString as S +#if !(MIN_VERSION_base(4,18,0)) +-- [base-4.18 / GHC 9.6.1]: Prelude now re-exports 'liftA2'. import Control.Applicative (liftA2) +#endif import Control.DeepSeq (NFData) import qualified Test.QuickCheck as QC import qualified Criterion.Main as C diff --git a/dev/Bench/Regression.hs b/dev/Bench/Regression.hs --- a/dev/Bench/Regression.hs +++ b/dev/Bench/Regression.hs @@ -5,7 +5,7 @@ -- ~ 2022.04.03 -- | -- Module : Bench.Regression --- Copyright : 2008--2022 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional diff --git a/dev/Bench/UnionWith.hs b/dev/Bench/UnionWith.hs --- a/dev/Bench/UnionWith.hs +++ b/dev/Bench/UnionWith.hs @@ -2,10 +2,10 @@ {-# LANGUAGE CPP, BangPatterns #-} ---------------------------------------------------------------- --- ~ 2022.02.21 +-- ~ 2023.03.19 -- | -- Module : Bench.UnionWith --- Copyright : 2008--2022 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional @@ -20,7 +20,10 @@ import qualified Data.Trie.Internal as TI import qualified Data.Trie.Convenience as TC import qualified Data.ByteString as S +#if !(MIN_VERSION_base(4,18,0)) +-- [base-4.18 / GHC 9.6.1]: Prelude now re-exports 'liftA2'. import Control.Applicative (liftA2) +#endif import Control.DeepSeq (NFData) import qualified Test.QuickCheck as QC import qualified Criterion.Main as C diff --git a/dev/Shared/BaseCompat.hs b/dev/Shared/BaseCompat.hs --- a/dev/Shared/BaseCompat.hs +++ b/dev/Shared/BaseCompat.hs @@ -5,7 +5,7 @@ -- ~ 2022.03.12 -- | -- Module : Shared.BaseCompat --- Copyright : 2008--2022 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional diff --git a/dev/Test/Main.hs b/dev/Test/Main.hs --- a/dev/Test/Main.hs +++ b/dev/Test/Main.hs @@ -8,7 +8,7 @@ -- ~ 2022.03.05 -- | -- Module : Test.Main --- Copyright : 2008--2022 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional diff --git a/dev/Test/Properties.hs b/dev/Test/Properties.hs --- a/dev/Test/Properties.hs +++ b/dev/Test/Properties.hs @@ -11,10 +11,10 @@ #define HideUnusedTopBonds ---------------------------------------------------------------- --- ~ 2022.03.13 +-- ~ 2023.03.19 -- | -- Module : Test.Properties --- Copyright : 2008--2022 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional @@ -36,7 +36,10 @@ import qualified Test.Tasty.SmallCheck as SC import qualified Test.Tasty.QuickCheck as QC +#if !(MIN_VERSION_base(4,18,0)) +-- [base-4.18 / GHC 9.6.1]: Prelude now re-exports 'liftA2'. import Control.Applicative (liftA2) +#endif #ifndef HideUnusedTopBonds import Control.Monad (join, (<=<)) #endif diff --git a/dev/Test/Utils.hs b/dev/Test/Utils.hs --- a/dev/Test/Utils.hs +++ b/dev/Test/Utils.hs @@ -9,7 +9,7 @@ -- ~ 2021.12.14 -- | -- Module : Test.Utils --- Copyright : 2008--2021 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional diff --git a/src/Data/Trie.hs b/src/Data/Trie.hs --- a/src/Data/Trie.hs +++ b/src/Data/Trie.hs @@ -7,7 +7,7 @@ -- ~ 2021.12.14 -- | -- Module : Data.Trie --- Copyright : 2008--2021 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional diff --git a/src/Data/Trie/Convenience.hs b/src/Data/Trie/Convenience.hs --- a/src/Data/Trie/Convenience.hs +++ b/src/Data/Trie/Convenience.hs @@ -7,7 +7,7 @@ -- ~ 2021.12.14 -- | -- Module : Data.Trie.Convenience --- Copyright : 2008--2021 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional diff --git a/src/Data/Trie/Internal.hs b/src/Data/Trie/Internal.hs --- a/src/Data/Trie/Internal.hs +++ b/src/Data/Trie/Internal.hs @@ -17,10 +17,10 @@ {-# LANGUAGE Trustworthy #-} #endif ------------------------------------------------------------ --- ~ 2022.04.03 +-- ~ 2023.03.19 -- | -- Module : Data.Trie.Internal --- Copyright : 2008--2022 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : experimental @@ -129,7 +129,10 @@ -- the Prelude re-exports all the other methods of 'Applicative' -- since base-4.8, it does not re-export 'liftA2' (at least not up -- through base-4.16.0.0 / GHC 9.2.1). +#if !(MIN_VERSION_base(4,18,0)) +-- [base-4.18 / GHC 9.6.1]: Prelude now re-exports 'liftA2'. import Control.Applicative (liftA2) +#endif #if MIN_VERSION_base(4,8,0) -- [aka GHC 7.10.1]: Prelude re-exports 'Applicative', @(<$>)@, -- 'Foldable', and 'Traversable'. But not 'liftA2'. diff --git a/src/Data/Trie/Internal/ByteString.hs b/src/Data/Trie/Internal/ByteString.hs --- a/src/Data/Trie/Internal/ByteString.hs +++ b/src/Data/Trie/Internal/ByteString.hs @@ -9,7 +9,7 @@ -- ~ 2022.02.27 -- | -- Module : Data.Trie.Internal.ByteString --- Copyright : 2008--2022 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : stable diff --git a/src/Data/Trie/Internal/Errors.hs b/src/Data/Trie/Internal/Errors.hs --- a/src/Data/Trie/Internal/Errors.hs +++ b/src/Data/Trie/Internal/Errors.hs @@ -8,7 +8,7 @@ -- ~ 2021.12.14 -- | -- Module : Data.Trie.Internal.Errors --- Copyright : 2008--2021 wren romano +-- Copyright : 2008--2023 wren romano -- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : internal