diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## [v1.4.7](https://github.com/diagrams/diagrams-lib/tree/v1.4.7) (2024-10-26) + +- Switch to `data-default-0.8` instead of `data-default-class` + +## [v1.4.6.2-r3](https://github.com/diagrams/diagrams-lib/tree/v1.4.6.2-r3) (2024-08-23) + +- Allow `hashable-1.5` + +## [v1.4.6.2-r2](https://github.com/diagrams/diagrams-lib/tree/v1.4.6.2-r2) (2024-07-01) + +- Allow `tasty-quickcheck-0.11` + +## [v1.4.6.2-r1](https://github.com/diagrams/diagrams-lib/tree/v1.4.6.2-r1) (2024-05-01) + +- Allow `base-4.21` (GHC 9.10), `containers-0.7`, `lens-5.3`, and `filepath-1.5` + ## [v1.4.6.2](https://github.com/diagrams/diagrams-lib/tree/v1.4.6.2) (2024-05-01) - Support for `linear-1.23`. This version of `linear` introduces a diff --git a/diagrams-lib.cabal b/diagrams-lib.cabal --- a/diagrams-lib.cabal +++ b/diagrams-lib.cabal @@ -1,5 +1,5 @@ Name: diagrams-lib -Version: 1.4.6.2 +Version: 1.4.7 Synopsis: Embedded domain-specific language for declarative graphics Description: Diagrams is a flexible, extensible EDSL for creating graphics of many types. Graphics can be created @@ -21,7 +21,7 @@ Cabal-version: 1.18 Extra-source-files: diagrams/*.svg Extra-doc-files: CHANGELOG.md, README.markdown, diagrams/*.svg -Tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 +Tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1 Source-repository head type: git location: http://github.com/diagrams/diagrams-lib.git @@ -101,8 +101,8 @@ Diagrams.TwoD.Vector, Diagrams.Util other-modules: Linear.Vector.Compat - Build-depends: base >= 4.9 && < 4.20, - containers >= 0.3 && < 0.7, + Build-depends: base >= 4.9 && < 4.21, + containers >= 0.3 && < 0.8, array >= 0.3 && < 0.6, semigroups >= 0.3.4 && < 0.21, monoid-extras >= 0.6 && < 0.7, @@ -111,15 +111,15 @@ diagrams-solve >= 0.1 && < 0.2, active >= 0.2 && < 0.3, colour >= 2.3.2 && < 2.4, - data-default-class < 0.2, + data-default >= 0.8 && < 0.9, fingertree >= 0.1 && < 0.2, intervals >= 0.7 && < 0.10, - lens >= 5.1 && < 5.3, + lens >= 5.1 && < 5.4, tagged >= 0.7 && < 0.9, optparse-applicative >= 0.11 && < 0.19, - filepath >= 1.4 && < 1.5, + filepath >= 1.4 && < 1.6, JuicyPixels >= 3.3.4 && < 3.4, - hashable >= 1.1 && < 1.5, + hashable >= 1.1 && < 1.6, linear >= 1.20.1 && < 1.24, adjunctions >= 4.0 && < 5.0, distributive >=0.2.2 && < 1.0, @@ -161,7 +161,7 @@ build-depends: base, tasty >= 0.10 && < 1.6, tasty-hunit >= 0.9.2 && < 0.11, - tasty-quickcheck >= 0.8 && < 0.11, + tasty-quickcheck >= 0.8 && < 0.12, QuickCheck >= 2.7, deepseq >= 1.3 && < 1.6, diagrams-lib, diff --git a/src/Diagrams/Attributes.hs b/src/Diagrams/Attributes.hs --- a/src/Diagrams/Attributes.hs +++ b/src/Diagrams/Attributes.hs @@ -92,7 +92,7 @@ import Data.Colour import Data.Colour.RGBSpace (RGB (..)) import Data.Colour.SRGB (toSRGB) -import Data.Default.Class +import Data.Default import Data.Distributive import Data.Monoid.Recommend import Data.Semigroup diff --git a/src/Diagrams/Combinators.hs b/src/Diagrams/Combinators.hs --- a/src/Diagrams/Combinators.hs +++ b/src/Diagrams/Combinators.hs @@ -41,7 +41,7 @@ ) where import Control.Lens hiding (beside, ( # )) -import Data.Default.Class +import Data.Default import Data.Maybe (fromJust) import Data.Monoid.Deletable (toDeletable) import Data.Monoid.MList (inj) diff --git a/src/Diagrams/Parametric/Adjust.hs b/src/Diagrams/Parametric/Adjust.hs --- a/src/Diagrams/Parametric/Adjust.hs +++ b/src/Diagrams/Parametric/Adjust.hs @@ -26,7 +26,7 @@ (.~), (^.)) import Data.Proxy -import Data.Default.Class +import Data.Default import Diagrams.Core.V import Diagrams.Parametric diff --git a/src/Diagrams/Prelude.hs b/src/Diagrams/Prelude.hs --- a/src/Diagrams/Prelude.hs +++ b/src/Diagrams/Prelude.hs @@ -22,7 +22,7 @@ -- | For working with default values. Diagrams also exports 'with', -- an alias for 'def'. - , module Data.Default.Class + , module Data.Default -- | For representing and operating on colors. , module Data.Colour @@ -97,7 +97,7 @@ import Data.Colour hiding (AffineSpace (..), atop, over) import Data.Colour.Names hiding (tan) import Data.Colour.SRGB -import Data.Default.Class +import Data.Default import Data.Semigroup import Linear.Affine diff --git a/src/Diagrams/TwoD/Adjust.hs b/src/Diagrams/TwoD/Adjust.hs --- a/src/Diagrams/TwoD/Adjust.hs +++ b/src/Diagrams/TwoD/Adjust.hs @@ -33,7 +33,7 @@ import Diagrams.Util (( # )) import Control.Lens (Lens', set, (^.)) -import Data.Default.Class +import Data.Default import Data.Semigroup diff --git a/src/Diagrams/TwoD/Arrow.hs b/src/Diagrams/TwoD/Arrow.hs --- a/src/Diagrams/TwoD/Arrow.hs +++ b/src/Diagrams/TwoD/Arrow.hs @@ -109,7 +109,7 @@ generateSignatures, lensRules, makeLensesWith, view, (%~), (&), (.~), (^.)) -import Data.Default.Class +import Data.Default import Data.Maybe (fromMaybe) import Data.Monoid.Coproduct (untangle) import Data.Semigroup diff --git a/src/Diagrams/TwoD/Arrowheads.hs b/src/Diagrams/TwoD/Arrowheads.hs --- a/src/Diagrams/TwoD/Arrowheads.hs +++ b/src/Diagrams/TwoD/Arrowheads.hs @@ -61,7 +61,7 @@ ) where import Control.Lens ((&), (.~), (<>~), (^.)) -import Data.Default.Class +import Data.Default import Data.Monoid (mempty, (<>)) import Diagrams.Angle diff --git a/src/Diagrams/TwoD/Attributes.hs b/src/Diagrams/TwoD/Attributes.hs --- a/src/Diagrams/TwoD/Attributes.hs +++ b/src/Diagrams/TwoD/Attributes.hs @@ -65,7 +65,7 @@ import Control.Lens hiding (transform) import Data.Colour hiding (AffineSpace, over) import Data.Data -import Data.Default.Class +import Data.Default import Data.Monoid.Recommend import Data.Semigroup diff --git a/src/Diagrams/TwoD/Combinators.hs b/src/Diagrams/TwoD/Combinators.hs --- a/src/Diagrams/TwoD/Combinators.hs +++ b/src/Diagrams/TwoD/Combinators.hs @@ -44,7 +44,7 @@ import Control.Lens ((&), (.~)) import Data.Colour -import Data.Default.Class +import Data.Default import Data.Semigroup import Diagrams.Core diff --git a/src/Diagrams/TwoD/Model.hs b/src/Diagrams/TwoD/Model.hs --- a/src/Diagrams/TwoD/Model.hs +++ b/src/Diagrams/TwoD/Model.hs @@ -38,7 +38,7 @@ import Control.Lens (makeLenses, (^.)) import Data.Colour (Colour) import Data.Colour.Names -import Data.Default.Class +import Data.Default import Data.List (intercalate) import qualified Data.Map as M import Data.Maybe (catMaybes) diff --git a/src/Diagrams/TwoD/Offset.hs b/src/Diagrams/TwoD/Offset.hs --- a/src/Diagrams/TwoD/Offset.hs +++ b/src/Diagrams/TwoD/Offset.hs @@ -53,7 +53,7 @@ import Data.Monoid import Data.Monoid.Inf -import Data.Default.Class +import Data.Default import Diagrams.Core @@ -309,7 +309,7 @@ -- "right" make sense. -- -- > import Diagrams.TwoD.Offset --- > import Data.Default.Class +-- > import Data.Default -- > -- > corner :: (OrderedField n) => Located (Trail V2 n) -- > corner = fromVertices (map p2 [(0, 0), (10, 0), (5, 6)]) `at` origin @@ -409,7 +409,7 @@ expandPath = expandPath' def -- > import Diagrams.TwoD.Offset --- > import Data.Default.Class +-- > import Data.Default -- > -- > expandTrailExample :: Diagram SVG -- > expandTrailExample = pad 1.1 . centerXY . hcat' (def & sep .~ 1) diff --git a/src/Diagrams/TwoD/Path.hs b/src/Diagrams/TwoD/Path.hs --- a/src/Diagrams/TwoD/Path.hs +++ b/src/Diagrams/TwoD/Path.hs @@ -67,7 +67,7 @@ import Data.Semigroup import Data.Typeable -import Data.Default.Class +import Data.Default import Diagrams.Angle import Diagrams.Combinators (withEnvelope, withTrace) diff --git a/src/Diagrams/TwoD/Polygons.hs b/src/Diagrams/TwoD/Polygons.hs --- a/src/Diagrams/TwoD/Polygons.hs +++ b/src/Diagrams/TwoD/Polygons.hs @@ -52,7 +52,7 @@ import Control.Monad.ST (ST, runST) import Data.Array.ST (STUArray, newArray, readArray, writeArray) -import Data.Default.Class +import Data.Default import Data.List (maximumBy, minimumBy) import Data.Maybe (catMaybes) import Data.Ord (comparing) diff --git a/src/Diagrams/TwoD/Shapes.hs b/src/Diagrams/TwoD/Shapes.hs --- a/src/Diagrams/TwoD/Shapes.hs +++ b/src/Diagrams/TwoD/Shapes.hs @@ -50,7 +50,7 @@ ) where import Control.Lens (makeLenses, op, (&), (.~), (<>~), (^.)) -import Data.Default.Class +import Data.Default import Data.Semigroup import Diagrams.Core diff --git a/src/Diagrams/TwoD/Text.hs b/src/Diagrams/TwoD/Text.hs --- a/src/Diagrams/TwoD/Text.hs +++ b/src/Diagrams/TwoD/Text.hs @@ -57,7 +57,7 @@ import Diagrams.TwoD.Types import Data.Colour hiding (over) -import Data.Default.Class +import Data.Default import Data.Monoid.Recommend import Data.Semigroup import Data.Typeable diff --git a/src/Diagrams/Util.hs b/src/Diagrams/Util.hs --- a/src/Diagrams/Util.hs +++ b/src/Diagrams/Util.hs @@ -41,7 +41,7 @@ import Control.Monad.Catch import Control.Monad.Trans import Control.Monad.Trans.Maybe -import Data.Default.Class +import Data.Default import Data.List import Data.Maybe import Data.Monoid