Tentatively migrate to GHC 9.2

This commit allows `aeson` to build and run on GHC 9.2.0.20210422,
including tests.

This is intended to help with migration to GHC 9.2, once it is released.

Changes:

- Remove tests for `Semigroup.Option` when base >= 4.16.0

Author: awjchen

aeson.cabal

@@ -92,8 +92,8 @@ library
     bytestring       >= 0.10.4.0 && < 0.12,
     containers       >= 0.5.5.1 && < 0.7,
     deepseq          >= 1.3.0.0 && < 1.5,
-    ghc-prim         >= 0.2     && < 0.8,
-    template-haskell >= 2.9.0.0 && < 2.18,
+    ghc-prim         >= 0.2     && < 0.9,
+    template-haskell >= 2.9.0.0 && < 2.19,
     text             >= 1.2.3.0 && < 1.3,
     time             >= 1.4     && < 1.12
 
@@ -102,7 +102,7 @@ library
 
   -- Compat
   build-depends:
-    base-compat-batteries >= 0.10.0   && < 0.12,
+    base-compat-batteries >= 0.10.0   && < 0.13,
     time-compat           >= 1.9.6    && < 1.10
 
   if !impl(ghc >= 8.6)
@@ -136,7 +136,7 @@ library
     these                >= 1.1      && < 1.2,
     unordered-containers >= 0.2.10.0 && < 0.3,
     uuid-types           >= 1.0.3    && < 1.1,
-    vector               >= 0.12.0.1 && < 0.13
+    vector               >= 0.12.0.1 && < 0.14
 
   ghc-options: -Wall
 

attoparsec-iso8601/attoparsec-iso8601.cabal

@@ -39,7 +39,7 @@ library
   build-depends:
     attoparsec >= 0.13.0.1 && < 0.15.0.0,
     base >= 4.7 && < 5,
-    base-compat-batteries >= 0.10.0 && < 0.12,
+    base-compat-batteries >= 0.10.0 && < 0.13,
     time-compat >= 1.9.4 && < 1.10,
     text >= 1.1.1.0 && < 1.3.0.0,
     time >= 1.1.1.4 && < 1.12

cabal.project

@@ -4,3 +4,106 @@ packages: attoparsec-iso8601
 packages: examples
 tests: true
 -- constraints: aeson +cffi
+
+-- TODO: Remove the below vendored packages when they have migrated to GHC 9.2
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/qc-instances
+  tag: b90f1211f0a1e022bf74336210ede3b875658c9e
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/primitive
+  tag: 1704f59d91ef964f83c120af4974251d50c2eb68
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/vector
+  tag: fb6f584abff163a361563a98a7760c563f7a6832
+  subdir: vector
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/time-compat
+  tag: dc10e814fcbdd85b7dd8da64df7ae954c580a7ed
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/these
+  tag: 1d03307d2b8ca1c03631df7e9d9651b25907ede2
+  subdir: these
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/assoc
+  tag: d43d2eccc31a37475898c56e7273f9ebcc182786
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/indexed-traversable
+  tag: ea22848a529e1225a0590ac3c73ea06a071
+  subdir: indexed-traversable
+
+source-repository-package
+  type: git
+  location: https://github.com/haskellari/splitmix
+  tag: 4606188a437e6f6478fed2a20cadd716589f25ea
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/integer-logarithms
+  tag: 7c774f6024151e284b82dc1ad14f5f454978cdd3
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/hashable
+  tag: 1bd4032cf83dab6640352bb9d31e1390e634a0b6
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/data-fix
+  tag: fb619187db1b6a358dbe1a62c45b07c904da72d3
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/primitive
+  tag: 1704f59d91ef964f83c120af4974251d50c2eb68
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/vector
+  tag: fb6f584abff163a361563a98a7760c563f7a6832
+  subdir: vector
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell/random
+  tag: 6d8b9b5f09bfd726662035c2a9687c1c23a3ebbc
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/scientific
+  tag: e76cc2299175ec922d67e555d2d112ad29142e5f
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/attoparsec
+  tag: 6c60dd7fd67d21903005b3db288f6c6da760507e
+
+source-repository-package
+  type: git
+  location: https://github.com/awjchen/base16-bytestring
+  tag: 18dd221ca3eebb0ecd46777c6c556b6fd58a3b45
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell-compat/base-compat
+  tag: 847aa35c4142f529525ffc645cd035ddb23ce8ee
+  subdir: base-compat
+
+source-repository-package
+  type: git
+  location: https://github.com/haskell-compat/base-compat
+  tag: 847aa35c4142f529525ffc645cd035ddb23ce8ee
+  subdir: base-compat-batteries

tests/Encoders.hs

@@ -272,6 +272,7 @@ gFooParseJSONRejectUnknownFieldsTagged = genericParseJSON optsRejectUnknownField
 -- Option fields
 --------------------------------------------------------------------------------
 
+#if !MIN_VERSION_base(4,16,0)
 thOptionFieldToJSON :: OptionField -> Value
 thOptionFieldToJSON = $(mkToJSON optsOptionField 'OptionField)
 
@@ -289,6 +290,7 @@ gOptionFieldToEncoding = genericToEncoding optsOptionField
 
 gOptionFieldParseJSON :: Value -> Parser OptionField
 gOptionFieldParseJSON = genericParseJSON optsOptionField
+#endif
 
 thMaybeFieldToJSON :: MaybeField -> Value
 thMaybeFieldToJSON = $(mkToJSON optsOptionField 'MaybeField)

tests/Instances.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE NoImplicitPrelude #-}
@@ -153,8 +154,10 @@ instance Arbitrary EitherTextInt where
 instance Arbitrary (GADT String) where
     arbitrary = GADT <$> arbitrary
 
+#if !MIN_VERSION_base(4,16,0)
 instance Arbitrary OptionField where
     arbitrary = OptionField <$> arbitrary
+#endif
 
 
 instance ApproxEq Char where

tests/PropertyGeneric.hs

@@ -5,13 +5,17 @@ module PropertyGeneric ( genericTests ) where
 
 import Prelude.Compat
 
+#if !MIN_VERSION_base(4,16,0)
 import Data.Semigroup (Option(..))
+#endif
 import Encoders
 import Instances ()
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
+#if !MIN_VERSION_base(4,16,0)
 import Test.QuickCheck ( (===) )
 import Types
+#endif
 import PropUtils
 
 
@@ -57,11 +61,13 @@ genericTests =
           , testProperty "Tagged"  (toParseJSON gOneConstructorParseJSONTagged  gOneConstructorToJSONTagged)
           ]
         ]
+#if !MIN_VERSION_base(4,16,0)
       , testGroup "OptionField" [
           testProperty "like Maybe" $
           \x -> gOptionFieldToJSON (OptionField (Option x)) === thMaybeFieldToJSON (MaybeField x)
         , testProperty "roundTrip" (toParseJSON gOptionFieldParseJSON gOptionFieldToJSON)
         ]
+#endif
       ]
     , testGroup "toEncoding" [
         testProperty "NullaryString" $
@@ -110,7 +116,9 @@ genericTests =
       , testProperty "OneConstructorTagged" $
         gOneConstructorToJSONTagged `sameAs` gOneConstructorToEncodingTagged
 
+#if !MIN_VERSION_base(4,16,0)
       , testProperty "OptionField" $
         gOptionFieldToJSON `sameAs` gOptionFieldToEncoding
+#endif
       ]
     ]

tests/PropertyTH.hs

@@ -1,16 +1,21 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 
 module PropertyTH ( templateHaskellTests ) where
 
 import Prelude.Compat
 
+#if !MIN_VERSION_base(4,16,0)
 import Data.Semigroup (Option(..))
+#endif
 import Encoders
 import Instances ()
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
+#if !MIN_VERSION_base(4,16,0)
 import Test.QuickCheck ( (===) )
 import Types
+#endif
 import PropUtils
 
 
@@ -74,11 +79,13 @@ templateHaskellTests =
           , testProperty "Tagged"  (toParseJSON thOneConstructorParseJSONTagged  thOneConstructorToJSONTagged)
           ]
         ]
+#if !MIN_VERSION_base(4,16,0)
       , testGroup "OptionField" [
           testProperty "like Maybe" $
           \x -> thOptionFieldToJSON (OptionField (Option x)) === thMaybeFieldToJSON (MaybeField x)
         , testProperty "roundTrip" (toParseJSON thOptionFieldParseJSON thOptionFieldToJSON)
         ]
+#endif
       ]
     , testGroup "toEncoding" [
         testProperty "NullaryString" $
@@ -124,7 +131,9 @@ templateHaskellTests =
       , testProperty "OneConstructorTagged" $
         thOneConstructorToJSONTagged `sameAs` thOneConstructorToEncodingTagged
 
+#if !MIN_VERSION_base(4,16,0)
       , testProperty "OptionField" $
         thOptionFieldToJSON `sameAs` thOptionFieldToEncoding
+#endif
       ]
     ]

tests/SerializationFormatSpec.hs

@@ -212,8 +212,10 @@ jsonExamples =
   , example "Semigroup.First Int" "2" (pure 2 :: Semigroup.First Int)
   , example "Semigroup.Last Int" "2" (pure 2 :: Semigroup.Last Int)
   , example "Semigroup.WrappedMonoid Int" "2" (Semigroup.WrapMonoid 2 :: Semigroup.WrappedMonoid Int)
+#if !MIN_VERSION_base(4,16,0)
   , example "Semigroup.Option Just" "2" (pure 2 :: Semigroup.Option Int)
   , example "Semigroup.Option Nothing" "null" (Semigroup.Option (Nothing :: Maybe Bool))
+#endif
 
   -- time 1.9
   , example "SystemTime" "123.123456789" (MkSystemTime 123 123456789)

tests/Types.hs

@@ -18,7 +18,9 @@ import Data.Data
 import Data.Functor.Compose (Compose (..))
 import Data.Functor.Identity (Identity (..))
 import Data.Hashable (Hashable (..))
+#if !MIN_VERSION_base(4,16,0)
 import Data.Semigroup (Option)
+#endif
 import Data.Text
 import Data.Time (Day (..), fromGregorian)
 import GHC.Generics
@@ -107,8 +109,10 @@ deriving instance Eq   (GADT a)
 deriving instance Show (GADT a)
 
 newtype MaybeField = MaybeField { maybeField :: Maybe Int }
+#if !MIN_VERSION_base(4,16,0)
 newtype OptionField = OptionField { optionField :: Option Int }
   deriving (Eq, Show)
+#endif
 
 deriving instance Generic Foo
 deriving instance Generic UFoo
@@ -120,7 +124,9 @@ deriving instance Generic (Approx a)
 deriving instance Generic Nullary
 deriving instance Generic (SomeType a)
 deriving instance Generic1 SomeType
+#if !MIN_VERSION_base(4,16,0)
 deriving instance Generic OptionField
+#endif
 deriving instance Generic EitherTextInt
 
 failure :: Show a => String -> String -> a -> Property