Merge pull request #71 from LeapYear/chinn/ghc-9

Support GHC 9
brandonchinn178 · Jun 14, 2021 · 273d404 · 273d404
2 parents 6d48d4c + 319c021
commit 273d404
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -231,6 +231,9 @@ workflows:
       - run_build_and_test:
           name: test_latest
           latest: true
+      - run_build_and_test:
+          name: test_ghc_9.0
+          stack_yaml: stack-ghc-9.0.yaml
       - run_build_and_test:
           name: test_ghc_8.10
           stack_yaml: stack-ghc-8.10.yaml

diff --git a/aeson-schemas.cabal b/aeson-schemas.cabal
@@ -1,10 +1,10 @@
 cabal-version: >= 1.10
 
--- This file has been generated from package.yaml by hpack version 0.33.0.
+-- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 80faccce54f3481d8cd37abc188cd5c521e19f5f78f181e08be5c8acd2c0a432
+-- hash: 9c7dcbeb57bbc2a26ee2ae8f24e1858196b44eb7c24d47ebc635162318a75886
 
 name:           aeson-schemas
 version:        1.3.3
@@ -81,7 +81,7 @@ library
     , first-class-families >=0.3.0.0 && <0.9
     , hashable >=1.2.7.0 && <1.4
     , megaparsec >=6.0.0 && <10
-    , template-haskell >=2.12.0.0 && <2.17
+    , template-haskell >=2.12.0.0 && <2.18
     , text >=1.2.2.2 && <1.3
     , unordered-containers >=0.2.8.0 && <0.3
   if impl(ghc >= 8.0)
@@ -134,7 +134,7 @@ test-suite aeson-schemas-test
     , tasty-golden
     , tasty-hunit
     , tasty-quickcheck
-    , template-haskell >=2.12.0.0 && <2.17
+    , template-haskell >=2.12.0.0 && <2.18
     , text >=1.2.2.2 && <1.3
     , th-orphans
     , th-test-utils
@@ -170,7 +170,7 @@ benchmark aeson-schemas-bench
     , first-class-families >=0.3.0.0 && <0.9
     , hashable >=1.2.7.0 && <1.4
     , megaparsec >=6.0.0 && <10
-    , template-haskell >=2.12.0.0 && <2.17
+    , template-haskell >=2.12.0.0 && <2.18
     , text >=1.2.2.2 && <1.3
     , th-test-utils
     , unordered-containers >=0.2.8.0 && <0.3

diff --git a/bench/Utils/DeepSeq.hs b/bench/Utils/DeepSeq.hs
@@ -55,7 +55,16 @@ instance NFData Type
 instance NFData TypeFamilyHead
 instance NFData TyLit
 instance NFData TySynEqn
+
+#if MIN_VERSION_template_haskell(2,17,0)
+instance NFData Specificity
+#endif
+
+#if MIN_VERSION_template_haskell(2,17,0)
+instance NFData flag => NFData (TyVarBndr flag)
+#else
 instance NFData TyVarBndr
+#endif
 
 #if MIN_VERSION_template_haskell(2,16,0)
 instance NFData Bytes

diff --git a/package.yaml b/package.yaml
@@ -40,7 +40,7 @@ dependencies:
 - first-class-families >= 0.3.0.0 && < 0.9
 - hashable >= 1.2.7.0 && < 1.4
 - megaparsec >= 6.0.0 && < 10
-- template-haskell >= 2.12.0.0 && < 2.17
+- template-haskell >= 2.12.0.0 && < 2.18
 - text >= 1.2.2.2 && < 1.3
 - unordered-containers >= 0.2.8.0 && < 0.3
 

diff --git a/src/Data/Aeson/Schema/TH/Utils.hs b/src/Data/Aeson/Schema/TH/Utils.hs
@@ -214,6 +214,9 @@ stripKinds ty =
     UnboxedTupleT _ -> ty
     UnboxedSumT _ -> ty
     ArrowT -> ty
+#if MIN_VERSION_template_haskell(2,17,0)
+    MulArrowT -> ty
+#endif
     EqualityT -> ty
     ListT -> ty
     PromotedTupleT _ -> ty

diff --git a/stack-ghc-9.0.yaml b/stack-ghc-9.0.yaml
@@ -0,0 +1,5 @@
+resolver: nightly-2021-06-10
+compiler: ghc-9.0.1
+
+ghc-options:
+  '$locals': -Werror
diff --git a/test/TestUtils/DeepSeq.hs b/test/TestUtils/DeepSeq.hs
@@ -55,7 +55,16 @@ instance NFData Type
 instance NFData TypeFamilyHead
 instance NFData TyLit
 instance NFData TySynEqn
+
+#if MIN_VERSION_template_haskell(2,17,0)
+instance NFData Specificity
+#endif
+
+#if MIN_VERSION_template_haskell(2,17,0)
+instance NFData flag => NFData (TyVarBndr flag)
+#else
 instance NFData TyVarBndr
+#endif
 
 #if MIN_VERSION_template_haskell(2,16,0)
 instance NFData Bytes

diff --git a/test/Tests/SchemaQQ/TH.hs b/test/Tests/SchemaQQ/TH.hs
@@ -11,6 +11,7 @@ module Tests.SchemaQQ.TH where
 import Control.DeepSeq (deepseq)
 import Data.Aeson (FromJSON, ToJSON)
 import Foreign.C (CBool (..))
+import Language.Haskell.TH (appTypeE)
 import Language.Haskell.TH.Quote (QuasiQuoter (..))
 import Language.Haskell.TH.TestUtils (
   MockedMode (..),
@@ -80,7 +81,8 @@ qState =
 schemaRep :: QuasiQuoter
 schemaRep = mkExpQQ $ \s ->
   let schemaType = quoteType schema s
-   in [|runTestQ qState (quoteType schema s) `deepseq` showSchema @ $schemaType|]
+      showSchemaQ = appTypeE [|showSchema|] schemaType
+   in [|runTestQ qState (quoteType schema s) `deepseq` $showSchemaQ|]
 
 schemaErr :: QuasiQuoter
 schemaErr = mkExpQQ $ \s -> [|runTestQErr qState (quoteType schema s)|]