Restore compatibility with aeson 1.5

Author: tarleb

hslua-aeson.cabal

@@ -27,7 +27,7 @@ source-repository head
 common common-options
   default-language:    Haskell2010
   build-depends:       base                 >= 4.8    && < 5
-                     , aeson                >= 2.0    && < 2.1
+                     , aeson                >= 1.5    && < 2.1
                      , bytestring           >= 0.10.2 && < 0.12
                      , containers           >= 0.5.9  && < 0.7
                      , hashable             >= 1.2    && < 1.5
@@ -39,6 +39,7 @@ common common-options
                      , text                 >= 1.0    && < 1.3
                      , vector               >= 0.7
   default-extensions:  BangPatterns
+                     , CPP
                      , LambdaCase
                      , OverloadedStrings
                      , TypeApplications

src/HsLua/Aeson.hs

@@ -35,19 +35,31 @@ module HsLua.Aeson
   ) where
 
 import Control.Monad ((<$!>), when)
-import Data.Aeson.Key (Key, toText, fromText)
-import Data.Aeson.KeyMap
 import Data.Scientific (Scientific, toRealFloat, fromFloatDigits)
 import Data.String (IsString (fromString))
 import Data.Vector (Vector)
 import HsLua.Core as Lua
 import HsLua.Marshalling as Lua
 
 import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.KeyMap as KeyMap
 import qualified Data.Vector as Vector
 import qualified HsLua.Core.Unsafe as Unsafe
 
+#if MIN_VERSION_aeson(2,0,0)
+import Data.Aeson.Key (Key, toText, fromText)
+import qualified Data.Aeson.KeyMap as KeyMap
+type KeyMap = KeyMap.KeyMap
+#else
+import Data.Text (Text)
+import qualified Data.HashMap.Strict as KeyMap
+type Key = Text
+type KeyMap = KeyMap.HashMap Key
+toText :: Key -> Text
+toText = id
+fromText :: Text -> Key
+fromText = id
+#endif
+
 -- Scientific
 pushScientific :: Pusher e Scientific
 pushScientific = pushRealFloat @Double . toRealFloat

test/test-hslua-aeson.hs

@@ -7,7 +7,6 @@ Tests for Aeson–Lua glue.
 -}
 import Control.Monad (when)
 import Data.AEq ((~==))
-import Data.Aeson.Key (Key, fromText)
 import Data.ByteString (ByteString)
 import Data.Scientific (Scientific, toRealFloat, fromFloatDigits)
 import HsLua.Core as Lua
@@ -20,10 +19,17 @@ import Test.Tasty.QuickCheck
 import Test.QuickCheck.Instances ()
 
 import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.KeyMap as KeyMap
 import qualified Data.Vector as Vector
 import qualified Test.QuickCheck.Monadic as QC
 
+#if MIN_VERSION_aeson(2,0,0)
+import Data.Aeson.Key (Key, fromText)
+import qualified Data.Aeson.KeyMap as KeyMap
+#else
+import qualified Data.HashMap.Strict as KeyMap
+#endif
+
+
 -- | Run this spec.
 main :: IO ()
 main = defaultMain tests
@@ -153,11 +159,13 @@ luaNumberToScientific = fromFloatDigits . (realToFrac :: Lua.Number -> Double)
 instance Arbitrary Aeson.Value where
   arbitrary = arbitraryValue 5
 
+#if MIN_VERSION_aeson(2,0,0)
 instance Arbitrary Key where
   arbitrary = fmap fromText arbitrary
 
 instance Arbitrary a => Arbitrary (KeyMap.KeyMap a) where
   arbitrary = fmap KeyMap.fromList arbitrary
+#endif
 
 arbitraryValue :: Int -> Gen Aeson.Value
 arbitraryValue size = frequency