From 2deefbb6c1283cf7d02782d1ebebc8884678f559 Mon Sep 17 00:00:00 2001 From: Melanie Brown Date: Fri, 6 Jun 2025 13:30:30 -0400 Subject: [PATCH] build with newer GHCs --- smash-aeson/smash-aeson.cabal | 4 ++-- smash-core/smash.cabal | 12 ++++++------ smash-core/src/Control/Monad/Trans/Can.hs | 2 +- smash-core/src/Control/Monad/Trans/Wedge.hs | 2 +- smash-lens/smash-lens.cabal | 4 ++-- smash-microlens/smash-microlens.cabal | 4 ++-- smash-optics/smash-optics.cabal | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/smash-aeson/smash-aeson.cabal b/smash-aeson/smash-aeson.cabal index 54e8dbb..8d4d33c 100644 --- a/smash-aeson/smash-aeson.cabal +++ b/smash-aeson/smash-aeson.cabal @@ -30,8 +30,8 @@ library Data.Wedge.Aeson build-depends: - aeson >=2.0 && <2.1 - , base >=4.1 && <4.17 + aeson >=2.0 + , base >=4.1 , smash >=0.1.3 , unordered-containers diff --git a/smash-core/smash.cabal b/smash-core/smash.cabal index 202c16c..e5ac2b3 100644 --- a/smash-core/smash.cabal +++ b/smash-core/smash.cabal @@ -1,6 +1,6 @@ cabal-version: 2.0 name: smash -version: 0.1.3 +version: 0.1.4 synopsis: Combinators for Maybe types description: Smash products are like the 'These' datatype, only with a unit. You can @@ -37,11 +37,11 @@ library other-modules: Data.Smash.Internal build-depends: - base >=4.12 && <4.17 - , bifunctors ^>=5.5 - , binary ^>=0.8 - , deepseq ^>=1.4 - , hashable ^>=1.3 + base >=4.12 && <5 + , bifunctors >=5.5 + , binary >=0.8 + , deepseq >=1.4 && < 2 + , hashable >=1.3 , mtl , template-haskell >=2.2 && < 3.0 diff --git a/smash-core/src/Control/Monad/Trans/Can.hs b/smash-core/src/Control/Monad/Trans/Can.hs index cfcede4..f19e4e8 100644 --- a/smash-core/src/Control/Monad/Trans/Can.hs +++ b/smash-core/src/Control/Monad/Trans/Can.hs @@ -105,7 +105,7 @@ instance (MonadState s m, Semigroup t) => MonadState s (CanT t m) where instance (Semigroup t, MonadRWS r w s m) => MonadRWS r w s (CanT t m) -instance MonadTrans (CanT a) where +instance (Semigroup a) => MonadTrans (CanT a) where lift = CanT . fmap Eno instance (MonadError e m, Semigroup e) => MonadError e (CanT e m) where diff --git a/smash-core/src/Control/Monad/Trans/Wedge.hs b/smash-core/src/Control/Monad/Trans/Wedge.hs index 96248de..550b09e 100644 --- a/smash-core/src/Control/Monad/Trans/Wedge.hs +++ b/smash-core/src/Control/Monad/Trans/Wedge.hs @@ -97,7 +97,7 @@ instance (MonadState s m, Semigroup t) => MonadState s (WedgeT t m) where instance (Semigroup t, MonadRWS r w s m) => MonadRWS r w s (WedgeT t m) -instance MonadTrans (WedgeT a) where +instance (Semigroup a) => MonadTrans (WedgeT a) where lift = WedgeT . fmap There instance (MonadError e m, Semigroup e) => MonadError e (WedgeT e m) where diff --git a/smash-lens/smash-lens.cabal b/smash-lens/smash-lens.cabal index a93c056..1ab6992 100644 --- a/smash-lens/smash-lens.cabal +++ b/smash-lens/smash-lens.cabal @@ -38,8 +38,8 @@ library -- other-modules: -- other-extensions: build-depends: - base >=4.11 && <4.17 - , lens >=4.0 && <5.2 + base >=4.11 + , lens >=4.0 , smash >=0.1.3 hs-source-dirs: src diff --git a/smash-microlens/smash-microlens.cabal b/smash-microlens/smash-microlens.cabal index 1f19e81..a539910 100644 --- a/smash-microlens/smash-microlens.cabal +++ b/smash-microlens/smash-microlens.cabal @@ -36,8 +36,8 @@ library -- other-modules: -- other-extensions: build-depends: - base >=4.11 && <4.17 - , microlens >=0.3 && <0.5 + base >=4.11 + , microlens >=0.3 , smash >=0.1.3 hs-source-dirs: src diff --git a/smash-optics/smash-optics.cabal b/smash-optics/smash-optics.cabal index d6aea63..5768b49 100644 --- a/smash-optics/smash-optics.cabal +++ b/smash-optics/smash-optics.cabal @@ -36,8 +36,8 @@ library Data.Wedge.Optics build-depends: - base >=4.11 && <4.17 - , optics-core >=0.3 && <0.5 + base >=4.11 + , optics-core >=0.3 , smash >=0.1.3 hs-source-dirs: src