diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3d3c020b..b74b7b99 100755 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,6 +34,7 @@ jobs: shell: bash run: | set -ex - stack upgrade - stack --version - stack test --no-terminal ${{ matrix.args }} --haddock --no-haddock-deps --bench --no-run-benchmarks + mkdir -p ../_newstack + stack upgrade --force-download --local-bin-path ../_newstack + ../_newstack/stack --version + ../_newstack/stack test --fast --no-terminal --resolver=${{ matrix.resolver }} diff --git a/mono-traversable/ChangeLog.md b/mono-traversable/ChangeLog.md index 3cdc3a61..e2f8149c 100644 --- a/mono-traversable/ChangeLog.md +++ b/mono-traversable/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for mono-traversable +## 1.0.15.2 + +* Support transformers 0.6.0.0 [#196](https://github.com/snoyberg/mono-traversable/issues/196) + ## 1.0.15.1 * Remove whitespace after `@` in as-patterns for GHC HEAD [#186](https://github.com/snoyberg/mono-traversable/pull/186) diff --git a/mono-traversable/package.yaml b/mono-traversable/package.yaml index 51108252..e8e26a98 100644 --- a/mono-traversable/package.yaml +++ b/mono-traversable/package.yaml @@ -1,5 +1,5 @@ name: mono-traversable -version: 1.0.15.1 +version: 1.0.15.2 synopsis: Type classes for mapping, folding, and traversing monomorphic containers description: Please see the README at category: Data diff --git a/mono-traversable/src/Data/MonoTraversable.hs b/mono-traversable/src/Data/MonoTraversable.hs index 3c9f8832..2387a21e 100644 --- a/mono-traversable/src/Data/MonoTraversable.hs +++ b/mono-traversable/src/Data/MonoTraversable.hs @@ -72,7 +72,9 @@ import qualified Data.Map.Strict as Map import Data.HashMap.Strict (HashMap) import Data.Vector (Vector) import Control.Monad.Trans.Maybe (MaybeT (..)) +#if !MIN_VERSION_transformers(0,6,0) import Control.Monad.Trans.List (ListT) +#endif import Control.Monad.Trans.Writer (WriterT) import qualified Control.Monad.Trans.Writer.Strict as Strict (WriterT) import Control.Monad.Trans.State (StateT(..)) @@ -128,7 +130,9 @@ type instance Element (HashSet e) = e type instance Element (Vector a) = a type instance Element (WrappedArrow a b c) = c type instance Element (MaybeT m a) = a +#if !MIN_VERSION_transformers(0,6,0) type instance Element (ListT m a) = a +#endif type instance Element (IdentityT m a) = a type instance Element (WriterT w m a) = a type instance Element (Strict.WriterT w m a) = a @@ -198,7 +202,9 @@ instance MonoFunctor (Vector a) instance MonoFunctor (Arg a b) instance Arrow a => MonoFunctor (WrappedArrow a b c) instance Functor m => MonoFunctor (MaybeT m a) +#if !MIN_VERSION_transformers(0,6,0) instance Functor m => MonoFunctor (ListT m a) +#endif instance Functor m => MonoFunctor (IdentityT m a) instance Functor m => MonoFunctor (WriterT w m a) instance Functor m => MonoFunctor (Strict.WriterT w m a) @@ -801,7 +807,9 @@ instance MonoFoldable (Either a b) where instance MonoFoldable (a, b) instance MonoFoldable (Const m a) instance F.Foldable f => MonoFoldable (MaybeT f a) +#if !MIN_VERSION_transformers(0,6,0) instance F.Foldable f => MonoFoldable (ListT f a) +#endif instance F.Foldable f => MonoFoldable (IdentityT f a) instance F.Foldable f => MonoFoldable (WriterT w f a) instance F.Foldable f => MonoFoldable (Strict.WriterT w f a) @@ -1099,7 +1107,9 @@ instance MonoTraversable (Either a b) where instance MonoTraversable (a, b) instance MonoTraversable (Const m a) instance Traversable f => MonoTraversable (MaybeT f a) +#if !MIN_VERSION_transformers(0,6,0) instance Traversable f => MonoTraversable (ListT f a) +#endif instance Traversable f => MonoTraversable (IdentityT f a) instance Traversable f => MonoTraversable (WriterT w f a) instance Traversable f => MonoTraversable (Strict.WriterT w f a) @@ -1209,7 +1219,9 @@ instance MonoPointed (r -> a) instance Monoid a => MonoPointed (a, b) instance Monoid m => MonoPointed (Const m a) instance Monad m => MonoPointed (WrappedMonad m a) +#if !MIN_VERSION_transformers(0,6,0) instance Applicative m => MonoPointed (ListT m a) +#endif instance Applicative m => MonoPointed (IdentityT m a) instance Arrow a => MonoPointed (WrappedArrow a b c) instance (Monoid w, Applicative m) => MonoPointed (WriterT w m a) diff --git a/stack.yaml b/stack.yaml index eb514686..0986e8fb 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-18.0 +resolver: lts-18.5 packages: - minlen - mono-traversable