diff --git a/prettyprinter-ansi-terminal/CHANGELOG.md b/prettyprinter-ansi-terminal/CHANGELOG.md index 089b0999..86382ec8 100644 --- a/prettyprinter-ansi-terminal/CHANGELOG.md +++ b/prettyprinter-ansi-terminal/CHANGELOG.md @@ -1,3 +1,7 @@ +# Unreleased + +- Drop support for GHC 7. + # [1.1.3] - [Deprecate the `Data.Text.Prettyprint.*` modules](https://github.com/quchen/prettyprinter/pull/203) diff --git a/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal b/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal index 6c941ffe..2d6c12b4 100644 --- a/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal +++ b/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal @@ -35,7 +35,7 @@ library build-depends: - base >= 4.5 && < 5 + base >= 4.9 && < 5 , ansi-terminal >= 0.4.0 , text >= 1.2 , prettyprinter >= 1.7.0 @@ -50,7 +50,7 @@ test-suite doctest hs-source-dirs: test/Doctest main-is: Main.hs build-depends: - base >= 4.7 && < 5 + base >= 4.9 && < 5 , doctest >= 0.9 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N default-language: Haskell2010 @@ -60,8 +60,8 @@ test-suite doctest benchmark large-output build-depends: - base >= 4.5 && < 5 - , base-compat >=0.9.3 && <0.12 + base >= 4.9 && < 5 + , base-compat >=0.9.3 && <0.15 , containers , deepseq , tasty-bench >= 0.2 diff --git a/prettyprinter-compat-annotated-wl-pprint/prettyprinter-compat-annotated-wl-pprint.cabal b/prettyprinter-compat-annotated-wl-pprint/prettyprinter-compat-annotated-wl-pprint.cabal index f0b7559e..94092fea 100644 --- a/prettyprinter-compat-annotated-wl-pprint/prettyprinter-compat-annotated-wl-pprint.cabal +++ b/prettyprinter-compat-annotated-wl-pprint/prettyprinter-compat-annotated-wl-pprint.cabal @@ -28,6 +28,6 @@ library other-extensions: CPP build-depends: - base >= 4.5 && < 5 + base >= 4.9 && < 5 , text >= 1.2 , prettyprinter >= 1.7 diff --git a/prettyprinter-compat-ansi-wl-pprint/CHANGELOG.md b/prettyprinter-compat-ansi-wl-pprint/CHANGELOG.md index bda2606c..4c5f4556 100644 --- a/prettyprinter-compat-ansi-wl-pprint/CHANGELOG.md +++ b/prettyprinter-compat-ansi-wl-pprint/CHANGELOG.md @@ -1,3 +1,7 @@ +# Unreleased + +- Drop support for GHC 7. + # [1.1] - [Change `renderPretty` to use `layoutPretty` instead of `layoutSmart`.](https://github.com/quchen/prettyprinter/pull/244) diff --git a/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint.cabal b/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint.cabal index b0da692e..1361a2a0 100644 --- a/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint.cabal +++ b/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint.cabal @@ -29,7 +29,7 @@ library , OverloadedStrings build-depends: - base >= 4.5 && < 5 + base >= 4.9 && < 5 , text >= 1.2 , prettyprinter >= 1.7.0 , prettyprinter-ansi-terminal >= 1.1 diff --git a/prettyprinter-compat-wl-pprint/prettyprinter-compat-wl-pprint.cabal b/prettyprinter-compat-wl-pprint/prettyprinter-compat-wl-pprint.cabal index faf1fad0..37e18f1d 100644 --- a/prettyprinter-compat-wl-pprint/prettyprinter-compat-wl-pprint.cabal +++ b/prettyprinter-compat-wl-pprint/prettyprinter-compat-wl-pprint.cabal @@ -28,7 +28,7 @@ library , OverloadedStrings build-depends: - base >= 4.5 && < 5 + base >= 4.9 && < 5 , text >= 1.2 , prettyprinter >= 1.7.0 diff --git a/prettyprinter-convert-ansi-wl-pprint/prettyprinter-convert-ansi-wl-pprint.cabal b/prettyprinter-convert-ansi-wl-pprint/prettyprinter-convert-ansi-wl-pprint.cabal index b7c6b243..1f6ee6fa 100644 --- a/prettyprinter-convert-ansi-wl-pprint/prettyprinter-convert-ansi-wl-pprint.cabal +++ b/prettyprinter-convert-ansi-wl-pprint/prettyprinter-convert-ansi-wl-pprint.cabal @@ -29,7 +29,7 @@ library , OverloadedStrings build-depends: - base >= 4.5 && < 5 + base >= 4.9 && < 5 , text >= 1.2 , prettyprinter >= 1.7.0 , prettyprinter-ansi-terminal >= 1.1.1 @@ -41,7 +41,7 @@ test-suite doctest hs-source-dirs: test/Doctest main-is: Main.hs build-depends: - base >= 4.7 && < 5 + base >= 4.9 && < 5 , doctest >= 0.9 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N default-language: Haskell2010 diff --git a/prettyprinter/CHANGELOG.md b/prettyprinter/CHANGELOG.md index 7c75af2e..ce844c7f 100644 --- a/prettyprinter/CHANGELOG.md +++ b/prettyprinter/CHANGELOG.md @@ -1,3 +1,7 @@ +# Unreleased + +- Drop support for GHC 7. + # [1.7.1] - [Deprecate the `Data.Text.Prettyprint.*` modules](https://github.com/quchen/prettyprinter/pull/203) diff --git a/prettyprinter/prettyprinter.cabal b/prettyprinter/prettyprinter.cabal index c5fd0f56..a7f517ad 100644 --- a/prettyprinter/prettyprinter.cabal +++ b/prettyprinter/prettyprinter.cabal @@ -67,7 +67,7 @@ library , ScopedTypeVariables build-depends: - base >= 4.5 && < 5 + base >= 4.9 && < 5 if flag(text) build-depends: text >= 1.2 @@ -112,7 +112,7 @@ executable generate_readme hs-source-dirs: app main-is: GenerateReadme.hs build-depends: - base >= 4.7 && < 5 + base >= 4.9 && < 5 , prettyprinter , text @@ -134,7 +134,7 @@ test-suite doctest hs-source-dirs: test/Doctest main-is: Main.hs build-depends: - base >= 4.7 && < 5 + base >= 4.9 && < 5 , doctest >= 0.9 , prettyprinter , QuickCheck >= 2.5 @@ -175,7 +175,7 @@ benchmark fusion hs-source-dirs: bench main-is: Fusion.hs build-depends: - base >= 4.5 && < 5 + base >= 4.9 && < 5 , prettyprinter , tasty-bench >= 0.2 @@ -192,7 +192,7 @@ benchmark fusion benchmark faster-unsafe-text build-depends: - base >= 4.5 && < 5 + base >= 4.9 && < 5 , prettyprinter , tasty-bench >= 0.2 @@ -209,8 +209,8 @@ benchmark faster-unsafe-text benchmark large-output build-depends: - base >= 4.5 && < 5 - , base-compat >=0.9.3 && <0.12 + base >= 4.9 && < 5 + , base-compat >=0.9.3 && <0.15 , prettyprinter , ansi-wl-pprint diff --git a/prettyprinter/src/Prettyprinter/Internal.hs b/prettyprinter/src/Prettyprinter/Internal.hs index 1518a2ef..25cd6afe 100755 --- a/prettyprinter/src/Prettyprinter/Internal.hs +++ b/prettyprinter/src/Prettyprinter/Internal.hs @@ -1,7 +1,6 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE CPP #-} {-# LANGUAGE DefaultSignatures #-} -{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GADTs #-} @@ -94,7 +93,6 @@ import Data.String (IsString (..)) import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.Lazy as Lazy -import Data.Typeable (Typeable) import Data.Void import Data.Word import GHC.Generics (Generic) @@ -195,7 +193,7 @@ data Doc ann = -- | Add an annotation to the enclosed 'Doc'. Can be used for example to add -- styling directives or alt texts that can then be used by the renderer. | Annotated ann (Doc ann) - deriving (Generic, Typeable) + deriving Generic -- | -- @ @@ -1530,7 +1528,6 @@ reAnnotateS re = go SAnnPush ann rest -> SAnnPush (re ann) (go rest) data AnnotationRemoval = Remove | DontRemove - deriving Typeable -- | Change the annotation of a document to a different annotation, or none at -- all. 'alterAnnotations' for 'SimpleDocStream'. @@ -1575,7 +1572,7 @@ data FusionDepth = -- This value should only be used if profiling shows it is significantly -- faster than using 'Shallow'. | Deep - deriving (Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show) -- | @('fuse' depth doc)@ combines text nodes so they can be rendered more -- efficiently. A fused document is always laid out identical to its unfused @@ -1676,7 +1673,7 @@ data SimpleDocStream ann = -- | Remove a previously pushed annotation. | SAnnPop (SimpleDocStream ann) - deriving (Eq, Ord, Show, Generic, Typeable) + deriving (Eq, Ord, Show, Generic) -- | Remove all trailing space characters. -- @@ -1762,7 +1759,6 @@ data WhitespaceStrippingState = AnnotationLevel !Int | RecordedWhitespace [Int] !Int -- ^ [Newline with indentation i] Spaces - deriving Typeable @@ -1826,14 +1822,12 @@ newtype FittingPredicate ann -> Maybe Int -> SimpleDocStream ann -> Bool) - deriving Typeable -- | List of nesting level/document pairs yet to be laid out. data LayoutPipeline ann = Nil | Cons !Int (Doc ann) (LayoutPipeline ann) | UndoAnn (LayoutPipeline ann) - deriving Typeable -- | Maximum number of characters that fit in one line. The layout algorithms -- will try not to exceed the set limit by inserting line breaks when applicable @@ -1854,7 +1848,7 @@ data PageWidth | Unbounded -- ^ Layouters should not introduce line breaks on their own. - deriving (Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show) defaultPageWidth :: PageWidth defaultPageWidth = AvailablePerLine 80 1 @@ -1876,7 +1870,7 @@ remainingWidth lineLength ribbonFraction lineIndent currentColumn = -- | Options to influence the layout algorithms. newtype LayoutOptions = LayoutOptions { layoutPageWidth :: PageWidth } - deriving (Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show) -- | The default layout options, suitable when you just want some output, and -- don’t particularly care about the details. Used by the 'Show' instance, for diff --git a/prettyprinter/src/Prettyprinter/Render/Util/SimpleDocTree.hs b/prettyprinter/src/Prettyprinter/Render/Util/SimpleDocTree.hs index e95ce3f9..55ff7194 100644 --- a/prettyprinter/src/Prettyprinter/Render/Util/SimpleDocTree.hs +++ b/prettyprinter/src/Prettyprinter/Render/Util/SimpleDocTree.hs @@ -1,5 +1,4 @@ {-# LANGUAGE CPP #-} -{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} #include "version-compatibility-macros.h" @@ -27,7 +26,6 @@ module Prettyprinter.Render.Util.SimpleDocTree ( import Control.Applicative import Data.Text (Text) import qualified Data.Text as T -import Data.Typeable (Typeable) import GHC.Generics import Prettyprinter @@ -104,7 +102,6 @@ renderSimplyDecoratedA text renderAnn = go -- -- Hand-written to avoid a dependency on a parser lib. newtype UniqueParser s a = UniqueParser { runParser :: s -> Maybe (a, s) } - deriving Typeable instance Functor (UniqueParser s) where fmap f (UniqueParser mx) = UniqueParser (\s -> @@ -144,7 +141,7 @@ data SimpleDocTok ann | TokLine Int | TokAnnPush ann | TokAnnPop - deriving (Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show) -- | A 'SimpleDocStream' is a linked list of different annotated cons cells -- ('SText' and then some further 'SimpleDocStream', 'SLine' and then some @@ -168,7 +165,7 @@ data SimpleDocTree ann -- | Horizontal concatenation of multiple documents. | STConcat [SimpleDocTree ann] - deriving (Eq, Ord, Show, Generic, Typeable) + deriving (Eq, Ord, Show, Generic) -- | Alter the document’s annotations. --