compat: Support Aeson 2.2.x

config/stack.yaml

@@ -22,13 +22,6 @@ packages:
   - morpheus-graphql-server
   - morpheus-graphql
 plan:
-  8.10.7:
-    deps:
-      fastsum: 0.1.1.1
-      graphql: 0.11.1.0
-    include:
-      - morpheus-graphql-benchmarks
-    resolver: lts-18.10
   8.2.2:
     resolver: lts-11.10
   8.4.4:
@@ -51,8 +44,16 @@ plan:
     deps:
       prettyprinter: 1.7.0
     resolver: lts-16.2
+  8.10.7:
+    deps:
+      fastsum: 0.1.1.1
+      graphql: 0.11.1.0
+    include:
+      - morpheus-graphql-benchmarks
+    resolver: lts-18.10
   9.0.2:
     deps:
+      attoparsec-aeson: 2.1.0.0
       dependent-map: 0.2.4.0
       dependent-sum: 0.4
     resolver: lts-19.28
@@ -63,26 +64,23 @@ plan:
       fraxl: 0.3.0.0
       haxl: 2.4.0.0
       type-aligned: 0.9.6
-    resolver: nightly-2023-04-23
+    resolver: nightly-2024-04-20
     skip:
       - examples/scotty-fraxl
       - examples/scotty-freer-simple
 rules:
-  Glob:
-    - 0.7.0
-    - 1.0.0
   aeson:
     - 1.4.4
     - 3.0.0
   attoparsec-aeson:
-    - 2.1.0
-    - '3'
+    - 2.1.0.0
+    - 3.0.0
   base:
     - 4.7.0
     - 5.0.0
   bytestring:
     - 0.10.4
-    - 0.12.0
+    - 0.15.0
   containers:
     - 0.4.2.1
     - 0.7.0
@@ -95,6 +93,9 @@ rules:
   filepath:
     - 1.1.0
     - 1.5.0
+  Glob:
+    - 0.7.0
+    - 1.0.0
   hashable:
     - 1.0.0
     - 2.0.0
@@ -109,7 +110,7 @@ rules:
     - 3.0.0
   optparse-applicative:
     - 0.12.0
-    - 0.18.0
+    - 0.20.0
   prettyprinter:
     - 1.7.0
     - 2.0.0

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.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -39,9 +39,9 @@ executable morpheus-client-example
   ghc-options: -Wall
   build-depends:
       base >=4.7 && <5
-    , bytestring >=0.10.4 && <0.12
+    , bytestring >=0.10.4
     , file-embed
     , morpheus-graphql-client
     , req >=2.1.0
-    , text >=1.2.3.0 && <1.3
+    , text >=1.2.3.0
   default-language: Haskell2010

examples/client/package.yaml

@@ -10,8 +10,8 @@ description: examples of GraphQL APIs
 
 dependencies:
   - base                            >= 4.7           && <  5
-  - bytestring                      >= 0.10.4        && <  0.12
-  - text                            >= 1.2.3.0       && <  1.3
+  - bytestring                      >= 0.10.4
+  - text                            >= 1.2.3.0
   - morpheus-graphql-client
   - req                             >= 2.1.0
   - file-embed

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.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -35,11 +35,11 @@ executable code-gen-docs-server
   ghc-options: -Wall
   build-depends:
       base >=4.7 && <5
-    , bytestring >=0.10.4 && <0.12
-    , containers >=0.4.2.1 && <0.7
+    , bytestring >=0.10.4
+    , containers >=0.4.2.1
     , morpheus-graphql
     , morpheus-graphql-client
     , morpheus-graphql-server
     , scotty
-    , text >=1.2.3.0 && <1.3
+    , text >=1.2.3.0
   default-language: Haskell2010

examples/code-gen-docs/package.yaml

@@ -10,13 +10,13 @@ description: examples of GraphQL APIs
 
 dependencies:
   - base                            >= 4.7       && <  5
-  - bytestring                      >= 0.10.4    && <  0.12
-  - text                            >= 1.2.3.0   && <  1.3
+  - bytestring                      >= 0.10.4
+  - text                            >= 1.2.3.0
   - morpheus-graphql
   - morpheus-graphql-server
   - morpheus-graphql-client
   - scotty
-  - containers                      >= 0.4.2.1       && <  0.7
+  - containers                      >= 0.4.2.1
 
 executables:
   code-gen-docs-server:

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.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -51,11 +51,11 @@ executable generated-server
   ghc-options: -Wall
   build-depends:
       base >=4.7 && <5
-    , bytestring >=0.10.4 && <0.12
-    , containers >=0.4.2.1 && <0.7
+    , bytestring >=0.10.4
+    , containers >=0.4.2.1
     , morpheus-graphql
     , morpheus-graphql-client
     , morpheus-graphql-server
     , scotty
-    , text >=1.2.3.0 && <1.3
+    , text >=1.2.3.0
   default-language: Haskell2010

examples/code-gen/package.yaml

@@ -10,13 +10,13 @@ description: examples of GraphQL APIs
 
 dependencies:
   - base                            >= 4.7       && <  5
-  - bytestring                      >= 0.10.4    && <  0.12
-  - text                            >= 1.2.3.0   && <  1.3
+  - bytestring                      >= 0.10.4
+  - text                            >= 1.2.3.0
   - morpheus-graphql
   - morpheus-graphql-server
   - morpheus-graphql-client
   - scotty
-  - containers                      >= 0.4.2.1       && <  0.7
+  - containers                      >= 0.4.2.1
 
 executables:
   generated-server:

examples/scotty-fraxl/morpheus-graphql-examples-scotty-fraxl.cabal

@@ -0,0 +1,41 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.36.0.
+--
+-- see: https://github.com/sol/hpack
+
+name:           morpheus-graphql-examples-scotty-fraxl
+version:        0.1.0
+synopsis:       examples
+description:    Fraxl example of GraphQL APIs
+category:       web, graphql
+homepage:       https://github.com/nalchevanidze/morpheus-graphql#readme
+bug-reports:    https://github.com/nalchevanidze/morpheus-graphql/issues
+author:         Daviti Nalchevanidze
+maintainer:     Daviti Nalchevanidze
+copyright:      (c) 2019 Daviti Nalchevanidze
+license:        MIT
+build-type:     Simple
+
+source-repository head
+  type: git
+  location: https://github.com/nalchevanidze/morpheus-graphql
+
+executable scotty-server-fraxl
+  main-is: Main.hs
+  other-modules:
+      Fraxl.API
+      Fraxl.FakeDB
+      Paths_morpheus_graphql_examples_scotty_fraxl
+  hs-source-dirs:
+      src
+  ghc-options: -Wall
+  build-depends:
+      base >=4.7 && <5
+    , containers >=0.4.2.1
+    , fraxl
+    , morpheus-graphql
+    , mtl >=2.0
+    , scotty
+    , text >=1.2.3.0
+  default-language: Haskell2010

examples/scotty-fraxl/package.yaml

@@ -10,9 +10,9 @@ description: Fraxl example of GraphQL APIs
 
 dependencies:
   - base                            >= 4.7       && <  5
-  - mtl                             >= 2.0       && <= 2.3
-  - text                            >= 1.2.3.0   && <  1.3
-  - containers                      >= 0.4.2.1   && <  0.7
+  - mtl                             >= 2.0
+  - text                            >= 1.2.3.0
+  - containers                      >= 0.4.2.1
   - morpheus-graphql
   - scotty
   - fraxl

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.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -33,12 +33,12 @@ executable scotty-server-haxl
   ghc-options: -Wall
   build-depends:
       base >=4.7 && <5
-    , containers >=0.4.2.1 && <0.7
+    , containers >=0.4.2.1
     , hashable
     , haxl
     , morpheus-graphql
     , morpheus-graphql-app
-    , mtl >=2.0 && <=2.3
+    , mtl >=2.0
     , scotty
-    , text >=1.2.3.0 && <1.3
+    , text >=1.2.3.0
   default-language: Haskell2010

examples/scotty-haxl/package.yaml

@@ -10,9 +10,9 @@ description: examples of GraphQL APIs
 
 dependencies:
   - base                            >= 4.7       && <  5
-  - mtl                             >= 2.0       && <= 2.3
-  - text                            >= 1.2.3.0   && <  1.3
-  - containers                      >= 0.4.2.1   && <  0.7
+  - mtl                             >= 2.0
+  - text                            >= 1.2.3.0
+  - containers                      >= 0.4.2.1
   - morpheus-graphql
   - morpheus-graphql-app
   - scotty

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.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -42,22 +42,22 @@ executable scotty-server
       src
   ghc-options: -Wall
   build-depends:
-      aeson >=1.4.4.0 && <3
+      aeson >=1.4.4.0
     , base >=4.7 && <5
-    , bytestring >=0.10.4 && <0.12
-    , containers >=0.4.2.1 && <0.7
+    , bytestring >=0.10.4
+    , containers >=0.4.2.1
     , extra
     , http-types
     , morpheus-graphql
     , morpheus-graphql-app
     , morpheus-graphql-core
     , morpheus-graphql-subscriptions
-    , mtl >=2.0 && <=2.3
+    , mtl >=2.0
     , scotty
     , stm
-    , text >=1.2.3.0 && <1.3
+    , text >=1.2.3.0
     , transformers
-    , wai-websockets >=1.0 && <=3.5
+    , wai-websockets >=1.0
     , warp
-    , websockets >=0.11.0 && <=0.13
+    , websockets >=0.11.0
   default-language: Haskell2010

examples/scotty/package.yaml

@@ -10,13 +10,13 @@ description: examples of GraphQL APIs
 
 dependencies:
   - base                            >= 4.7       && <  5
-  - aeson                           >= 1.4.4.0   && < 3
-  - bytestring                      >= 0.10.4    && <  0.12
-  - text                            >= 1.2.3.0   && <  1.3
-  - containers                      >= 0.4.2.1   && <  0.7
-  - mtl                             >= 2.0       && <= 2.3
-  - websockets                      >= 0.11.0    &&  <= 0.13
-  - wai-websockets                  >= 1.0       &&  <= 3.5
+  - aeson                           >= 1.4.4.0
+  - bytestring                      >= 0.10.4
+  - text                            >= 1.2.3.0
+  - containers                      >= 0.4.2.1
+  - mtl                             >= 2.0
+  - websockets                      >= 0.11.0
+  - wai-websockets                  >= 1.0
   - morpheus-graphql
   - morpheus-graphql-core
   - morpheus-graphql-app

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.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -33,15 +33,15 @@ executable servant-server
   ghc-options: -Wall
   build-depends:
       base >=4.7 && <5
-    , bytestring >=0.10.4 && <0.12
+    , bytestring >=0.10.4
     , file-embed
     , http-media
     , morpheus-graphql
     , morpheus-graphql-subscriptions
-    , mtl >=2.0 && <=2.3
+    , mtl >=2.0
     , servant-server
-    , text >=1.2.3.0 && <1.3
-    , wai-websockets >=1.0 && <=3.5
+    , text >=1.2.3
+    , wai-websockets >=1.0
     , warp
-    , websockets >=0.11.0 && <=0.13
+    , websockets >=0.11.0
   default-language: Haskell2010

examples/servant/package.yaml

@@ -10,13 +10,13 @@ description: examples of GraphQL APIs
 
 dependencies:
   - base                              >= 4.7       && <  5
-  - bytestring                        >= 0.10.4    && <  0.12
-  - text                              >= 1.2.3.0   && <  1.3
-  - mtl                               >= 2.0       && <= 2.3
+  - bytestring                        >= 0.10.4
+  - text                              >= 1.2.3
+  - mtl                               >= 2.0
   - morpheus-graphql
   - morpheus-graphql-subscriptions
-  - wai-websockets                    >= 1.0       &&  <= 3.5
-  - websockets                        >= 0.11.0    &&  <= 0.13
+  - wai-websockets                    >= 1.0
+  - websockets                        >= 0.11.0
   - warp
   - servant-server
   - http-media