Merge pull request #802 from galenhuntington/master

Support template-haskell 2.17.

Author: bergmark

Data/Aeson/Types/Internal.hs

@@ -426,7 +426,9 @@ instance TH.Lift Value where
       where a' = V.toList a
     lift (Object o) = [| Object (H.fromList . map (first pack) $ o') |]
       where o' = map (first unpack) . H.toList $ o
-#if MIN_VERSION_template_haskell(2,16,0)
+#if MIN_VERSION_template_haskell(2,17,0)
+    liftTyped = TH.unsafeCodeCoerce . TH.lift
+#elif MIN_VERSION_template_haskell(2,16,0)
     liftTyped = TH.unsafeTExpCoerce . TH.lift
 #endif
 

aeson.cabal

@@ -103,8 +103,8 @@ library
     bytestring       >= 0.10.4.0 && < 0.11,
     containers       >= 0.5.5.1 && < 0.7,
     deepseq          >= 1.3.0.0 && < 1.5,
-    ghc-prim         >= 0.2     && < 0.7,
-    template-haskell >= 2.9.0.0 && < 2.17,
+    ghc-prim         >= 0.2     && < 0.8,
+    template-haskell >= 2.9.0.0 && < 2.18,
     text             >= 1.2.3.0 && < 1.3,
     time             >= 1.4     && < 1.11