diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 141d8df..cc0859e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,7 @@ jobs: strategy: matrix: cabal: ["3.10"] - ghc: ["9.6.3", "9.8.2", "9.10.1"] + ghc: ["9.8.4", "9.10.1", "9.12.1"] env: CONFIG: "--enable-tests --enable-benchmarks --flags=dev" steps: diff --git a/Text/Mustache/Type.hs b/Text/Mustache/Type.hs index d08b585..2511c62 100644 --- a/Text/Mustache/Type.hs +++ b/Text/Mustache/Type.hs @@ -36,7 +36,7 @@ import Data.Map qualified as M import Data.String (IsString (..)) import Data.Text (Text) import Data.Text qualified as T -import Data.Typeable (Typeable, cast) +import Data.Typeable (cast) import Data.Void import GHC.Generics import Language.Haskell.TH.Syntax qualified as TH @@ -57,7 +57,7 @@ data Template = Template -- “focus” can be switched easily by modifying 'templateActual'. templateCache :: Map PName [Node] } - deriving (Eq, Ord, Show, Data, Typeable, Generic) + deriving (Eq, Ord, Show, Data, Generic) instance Semigroup Template where (Template pname x) <> (Template _ y) = Template pname (M.union x y) @@ -81,7 +81,7 @@ data Node InvertedSection Key [Node] | -- | Partial with indentation level ('Nothing' means it was inlined) Partial PName (Maybe Pos) - deriving (Eq, Ord, Show, Data, Typeable, Generic) + deriving (Eq, Ord, Show, Data, Generic) -- | @since 2.1.0 instance TH.Lift Node where @@ -96,7 +96,7 @@ instance TH.Lift Node where -- * @[text]@—single key is a normal identifier; -- * @[text1, text2]@—multiple keys represent dotted names. newtype Key = Key {unKey :: [Text]} - deriving (Eq, Ord, Show, Semigroup, Monoid, Data, Typeable, Generic) + deriving (Eq, Ord, Show, Semigroup, Monoid, Data, Generic) instance NFData Key @@ -116,7 +116,7 @@ showKey (Key xs) = T.intercalate "." xs -- | Identifier for partials. Note that with the @OverloadedStrings@ -- extension you can use just string literals to create values of this type. newtype PName = PName {unPName :: Text} - deriving (Eq, Ord, Show, Data, Typeable, Generic) + deriving (Eq, Ord, Show, Data, Generic) instance IsString PName where fromString = PName . T.pack @@ -137,7 +137,7 @@ newtype MustacheException -- -- /The 'Text' field was added in version 1.0.0./ MustacheParserException (ParseErrorBundle Text Void) - deriving (Eq, Show, Typeable, Generic) + deriving (Eq, Show, Generic) instance Exception MustacheException where displayException (MustacheParserException b) = errorBundlePretty b @@ -152,7 +152,7 @@ data MustacheWarning | -- | A complex value such as an 'Object' or 'Array' was directly -- rendered into the template. MustacheDirectlyRenderedValue Key - deriving (Eq, Show, Typeable, Generic) + deriving (Eq, Show, Generic) -- | Pretty-print a 'MustacheWarning'. -- diff --git a/stache.cabal b/stache.cabal index a5c9958..d15a03b 100644 --- a/stache.cabal +++ b/stache.cabal @@ -5,7 +5,7 @@ license: MIT license-file: LICENSE maintainer: Mark Karpov author: Mark Karpov -tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.1 +tested-with: ghc ==9.8.4 ghc ==9.10.1 ghc ==9.12.1 homepage: https://github.com/stackbuilders/stache bug-reports: https://github.com/stackbuilders/stache/issues synopsis: Mustache templates for Haskell @@ -51,7 +51,7 @@ library filepath >=1.2 && <1.6, megaparsec >=7 && <10, mtl >=2.1 && <3, - template-haskell >=2.11 && <2.23, + template-haskell >=2.11 && <2.24, text >=1.2 && <2.2, vector >=0.11 && <0.14