From 65e854660bb95fc7f3ff592b1f97404ddc31a981 Mon Sep 17 00:00:00 2001 From: David Nalchevanidze Date: Sun, 30 Jun 2024 22:33:06 +0200 Subject: [PATCH] Depenecnies (#873) * MonadIO m, MonadFail m * unwords * update dependencies --- cspell.yml | 3 ++- examples/client/morpheus-graphql-examples-client.cabal | 2 +- .../morpheus-graphql-examples-code-gen-docs.cabal | 2 +- examples/code-gen/morpheus-graphql-examples-code-gen.cabal | 2 +- .../scotty-fraxl/morpheus-graphql-examples-scotty-fraxl.cabal | 2 +- .../morpheus-graphql-examples-scotty-freer.cabal | 2 +- .../scotty-haxl/morpheus-graphql-examples-scotty-haxl.cabal | 2 +- examples/scotty/morpheus-graphql-examples-scotty.cabal | 2 +- examples/servant/morpheus-graphql-examples-servant.cabal | 2 +- .../yesod-pubsub/morpheus-graphql-examples-yesod-pubsub.cabal | 2 +- hconf.yaml | 2 +- morpheus-graphql-app/morpheus-graphql-app.cabal | 2 +- .../src/Data/Morpheus/App/RenderIntrospection.hs | 2 +- morpheus-graphql-benchmarks/morpheus-graphql-benchmarks.cabal | 2 +- morpheus-graphql-client/morpheus-graphql-client.cabal | 2 +- .../morpheus-graphql-code-gen-utils.cabal | 2 +- morpheus-graphql-code-gen/morpheus-graphql-code-gen.cabal | 4 ++-- morpheus-graphql-code-gen/package.yaml | 2 +- morpheus-graphql-core/morpheus-graphql-core.cabal | 2 +- morpheus-graphql-server/morpheus-graphql-server.cabal | 2 +- .../morpheus-graphql-subscriptions.cabal | 2 +- morpheus-graphql-tests/morpheus-graphql-tests.cabal | 2 +- morpheus-graphql/morpheus-graphql.cabal | 2 +- 23 files changed, 25 insertions(+), 24 deletions(-) diff --git a/cspell.yml b/cspell.yml index 242afa0c9..dc63d2360 100644 --- a/cspell.yml +++ b/cspell.yml @@ -46,10 +46,10 @@ words: - Hackage - Hashable - haxl + - hconf - hlint - hpack - hsep - - hconf - hunit - ifromJSON - inlineable @@ -86,6 +86,7 @@ words: - unlift - unliftio - Unpackedness + - unwords - vsep - websockets - whnf diff --git a/examples/client/morpheus-graphql-examples-client.cabal b/examples/client/morpheus-graphql-examples-client.cabal index 70003fea1..8f8294258 100644 --- a/examples/client/morpheus-graphql-examples-client.cabal +++ b/examples/client/morpheus-graphql-examples-client.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/examples/code-gen-docs/morpheus-graphql-examples-code-gen-docs.cabal b/examples/code-gen-docs/morpheus-graphql-examples-code-gen-docs.cabal index 8260dafa7..bf9c6c811 100644 --- a/examples/code-gen-docs/morpheus-graphql-examples-code-gen-docs.cabal +++ b/examples/code-gen-docs/morpheus-graphql-examples-code-gen-docs.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/examples/code-gen/morpheus-graphql-examples-code-gen.cabal b/examples/code-gen/morpheus-graphql-examples-code-gen.cabal index f3afb5b6a..a564284bf 100644 --- a/examples/code-gen/morpheus-graphql-examples-code-gen.cabal +++ b/examples/code-gen/morpheus-graphql-examples-code-gen.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/examples/scotty-fraxl/morpheus-graphql-examples-scotty-fraxl.cabal b/examples/scotty-fraxl/morpheus-graphql-examples-scotty-fraxl.cabal index 125841df0..1327f2bff 100644 --- a/examples/scotty-fraxl/morpheus-graphql-examples-scotty-fraxl.cabal +++ b/examples/scotty-fraxl/morpheus-graphql-examples-scotty-fraxl.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/examples/scotty-freer-simple/morpheus-graphql-examples-scotty-freer.cabal b/examples/scotty-freer-simple/morpheus-graphql-examples-scotty-freer.cabal index 004b57b7c..74986f41b 100644 --- a/examples/scotty-freer-simple/morpheus-graphql-examples-scotty-freer.cabal +++ b/examples/scotty-freer-simple/morpheus-graphql-examples-scotty-freer.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/examples/scotty-haxl/morpheus-graphql-examples-scotty-haxl.cabal b/examples/scotty-haxl/morpheus-graphql-examples-scotty-haxl.cabal index b4f8c0e9c..cf66ee9b7 100644 --- a/examples/scotty-haxl/morpheus-graphql-examples-scotty-haxl.cabal +++ b/examples/scotty-haxl/morpheus-graphql-examples-scotty-haxl.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/examples/scotty/morpheus-graphql-examples-scotty.cabal b/examples/scotty/morpheus-graphql-examples-scotty.cabal index 1211dd5ec..de75b6f6f 100644 --- a/examples/scotty/morpheus-graphql-examples-scotty.cabal +++ b/examples/scotty/morpheus-graphql-examples-scotty.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/examples/servant/morpheus-graphql-examples-servant.cabal b/examples/servant/morpheus-graphql-examples-servant.cabal index 6d158ffbd..e7e416f77 100644 --- a/examples/servant/morpheus-graphql-examples-servant.cabal +++ b/examples/servant/morpheus-graphql-examples-servant.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/examples/yesod-pubsub/morpheus-graphql-examples-yesod-pubsub.cabal b/examples/yesod-pubsub/morpheus-graphql-examples-yesod-pubsub.cabal index a9d381a87..9809e2faf 100644 --- a/examples/yesod-pubsub/morpheus-graphql-examples-yesod-pubsub.cabal +++ b/examples/yesod-pubsub/morpheus-graphql-examples-yesod-pubsub.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/hconf.yaml b/hconf.yaml index 2ac18b7b7..45fa0033f 100644 --- a/hconf.yaml +++ b/hconf.yaml @@ -82,7 +82,7 @@ dependencies: - directory >= 1.0.0 && < 2.0.0 - extra >= 1.0.0 && < 2.0.0 - file-embed >= 0.0.10 && < 1.0.0 -- filepath >= 1.1.0 && <= 1.5.2.0 +- filepath >= 1.1.0 && <= 1.5.3.0 - fraxl >= 0.1 && < 1.0 - freer-simple >= 1.0 && < 3.0 - graphql >= 0.5 && < 2.0 diff --git a/morpheus-graphql-app/morpheus-graphql-app.cabal b/morpheus-graphql-app/morpheus-graphql-app.cabal index 276088797..247a5d409 100644 --- a/morpheus-graphql-app/morpheus-graphql-app.cabal +++ b/morpheus-graphql-app/morpheus-graphql-app.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/morpheus-graphql-app/src/Data/Morpheus/App/RenderIntrospection.hs b/morpheus-graphql-app/src/Data/Morpheus/App/RenderIntrospection.hs index 333959741..3c70db0e1 100644 --- a/morpheus-graphql-app/src/Data/Morpheus/App/RenderIntrospection.hs +++ b/morpheus-graphql-app/src/Data/Morpheus/App/RenderIntrospection.hs @@ -13,7 +13,7 @@ module Data.Morpheus.App.RenderIntrospection ) where -import Control.Monad.Except (MonadError (throwError)) +import Control.Monad.Except (MonadError (..)) import Data.Morpheus.App.Internal.Resolving.MonadResolver ( MonadResolver, ResolverContext (..), diff --git a/morpheus-graphql-benchmarks/morpheus-graphql-benchmarks.cabal b/morpheus-graphql-benchmarks/morpheus-graphql-benchmarks.cabal index a0ea01164..43ab8d3b3 100644 --- a/morpheus-graphql-benchmarks/morpheus-graphql-benchmarks.cabal +++ b/morpheus-graphql-benchmarks/morpheus-graphql-benchmarks.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/morpheus-graphql-client/morpheus-graphql-client.cabal b/morpheus-graphql-client/morpheus-graphql-client.cabal index 13d8ae211..b766d9c86 100644 --- a/morpheus-graphql-client/morpheus-graphql-client.cabal +++ b/morpheus-graphql-client/morpheus-graphql-client.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/morpheus-graphql-code-gen-utils/morpheus-graphql-code-gen-utils.cabal b/morpheus-graphql-code-gen-utils/morpheus-graphql-code-gen-utils.cabal index d2d7e4eb6..f0e81511a 100644 --- a/morpheus-graphql-code-gen-utils/morpheus-graphql-code-gen-utils.cabal +++ b/morpheus-graphql-code-gen-utils/morpheus-graphql-code-gen-utils.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/morpheus-graphql-code-gen/morpheus-graphql-code-gen.cabal b/morpheus-graphql-code-gen/morpheus-graphql-code-gen.cabal index 449e7842d..47304c894 100644 --- a/morpheus-graphql-code-gen/morpheus-graphql-code-gen.cabal +++ b/morpheus-graphql-code-gen/morpheus-graphql-code-gen.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack @@ -71,7 +71,7 @@ executable morpheus , bytestring >=0.10.4 && <0.15.0 , containers >=0.4.2.1 && <=0.7 , file-embed >=0.0.10 && <1.0.0 - , filepath >=1.1.0 && <=1.5.2.0 + , filepath >=1.1.0 && <=1.5.3.0 , morpheus-graphql-client >=0.28.0 && <0.29.0 , morpheus-graphql-code-gen >=0.28.0 && <0.29.0 , morpheus-graphql-code-gen-utils >=0.28.0 && <0.29.0 diff --git a/morpheus-graphql-code-gen/package.yaml b/morpheus-graphql-code-gen/package.yaml index e4a901f4d..0169abbc4 100644 --- a/morpheus-graphql-code-gen/package.yaml +++ b/morpheus-graphql-code-gen/package.yaml @@ -38,7 +38,7 @@ executables: ghc-options: -Wall dependencies: - Glob >= 0.7.0 && < 1.0.0 - - filepath >= 1.1.0 && <= 1.5.2.0 + - filepath >= 1.1.0 && <= 1.5.3.0 - morpheus-graphql-client >= 0.28.0 && < 0.29.0 - morpheus-graphql-code-gen >= 0.28.0 && < 0.29.0 - morpheus-graphql-code-gen-utils >= 0.28.0 && < 0.29.0 diff --git a/morpheus-graphql-core/morpheus-graphql-core.cabal b/morpheus-graphql-core/morpheus-graphql-core.cabal index c73c03def..50c9cfd2f 100644 --- a/morpheus-graphql-core/morpheus-graphql-core.cabal +++ b/morpheus-graphql-core/morpheus-graphql-core.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/morpheus-graphql-server/morpheus-graphql-server.cabal b/morpheus-graphql-server/morpheus-graphql-server.cabal index 9fcd8fcb8..53e8ab9a1 100644 --- a/morpheus-graphql-server/morpheus-graphql-server.cabal +++ b/morpheus-graphql-server/morpheus-graphql-server.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/morpheus-graphql-subscriptions/morpheus-graphql-subscriptions.cabal b/morpheus-graphql-subscriptions/morpheus-graphql-subscriptions.cabal index bef5abe21..ec2d0f241 100644 --- a/morpheus-graphql-subscriptions/morpheus-graphql-subscriptions.cabal +++ b/morpheus-graphql-subscriptions/morpheus-graphql-subscriptions.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/morpheus-graphql-tests/morpheus-graphql-tests.cabal b/morpheus-graphql-tests/morpheus-graphql-tests.cabal index 0b7d81fb5..cb1a6874d 100644 --- a/morpheus-graphql-tests/morpheus-graphql-tests.cabal +++ b/morpheus-graphql-tests/morpheus-graphql-tests.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack diff --git a/morpheus-graphql/morpheus-graphql.cabal b/morpheus-graphql/morpheus-graphql.cabal index 44f03b29d..253ee62d4 100644 --- a/morpheus-graphql/morpheus-graphql.cabal +++ b/morpheus-graphql/morpheus-graphql.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack