Support aeson-2.0, and more bound relaxations

Author: phadej

.github/workflows/haskell-ci.yml

@@ -192,6 +192,7 @@ jobs:
           allow-newer:  deepseq-generics-0.2.0.0:base
           allow-newer:  deepseq-generics-0.2.0.0:ghc-prim
           allow-newer:  cryptohash-sha1-0.11.100.1:base
+          allow-newer:  http-link-header-1.2.0:attoparsec
           optimization: False
           EOF
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(github|github-samples)$/; }' >> cabal.project.local

cabal.project

@@ -13,3 +13,4 @@ constraints: github-samples +openssl
 allow-newer: deepseq-generics-0.2.0.0:base
 allow-newer: deepseq-generics-0.2.0.0:ghc-prim
 allow-newer: cryptohash-sha1-0.11.100.1:base
+allow-newer: http-link-header-1.2.0:attoparsec

github.cabal

@@ -170,8 +170,8 @@ library
 
   -- other packages
   build-depends:
-      aeson                 >=1.4.0.0    && <1.6
-    , base-compat           >=0.11.1     && <0.12
+      aeson                 >=1.4.0.0    && <1.6 || >=2.0.1.0 && <2.1
+    , base-compat           >=0.11.1     && <0.13
     , base16-bytestring     >=0.1.1.6    && <1.1
     , binary-instances      >=1          && <1.1
     , cryptohash-sha1       >=0.11.100.1 && <0.12
@@ -184,7 +184,7 @@ library
     , iso8601-time          >=0.1.5      && <0.2
     , network-uri           >=2.6.1.0    && <2.7
     , tagged                >=0.8.5      && <0.9
-    , transformers-compat   >=0.6.5      && <0.7
+    , transformers-compat   >=0.6.5      && <0.8
     , unordered-containers  >=0.2.10.0   && <0.3
     , vector                >=0.12.0.1   && <0.13
     , vector-instances      >=3.4        && <3.5

src/GitHub/Data/Content.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 -- |
 -- License     :  BSD-3-Clause
@@ -15,6 +16,10 @@ import Data.Aeson.Types (Pair)
 import Data.Maybe (maybe)
 import qualified Data.Text as T
 
+#if MIN_VERSION_aeson(2,0,0)
+import Data.Aeson (Key)
+#endif
+
 data Content
   = ContentFile !ContentFileData
   | ContentDirectory !(Vector ContentItem)
@@ -205,5 +210,9 @@ instance ToJSON DeleteFile where
     ++ "author"    .=? deleteFileAuthor
     ++ "committer" .=? deleteFileCommitter
 
+#if MIN_VERSION_aeson(2,0,0)
+(.=?) :: ToJSON v => Key -> Maybe v -> [Pair]
+#else
 (.=?) :: ToJSON v => Text -> Maybe v -> [Pair]
+#endif
 name .=? value = maybe [] (pure . (name .=)) value

src/GitHub/Internal/Prelude.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 -- |
 -- License     :  BSD-3-Clause