Merge pull request #389 from haskell/mpj/aeson-cpp

Remove CPP by using higher bound for the lsp test component

Author: jneira

lsp/lsp.cabal

@@ -112,7 +112,8 @@ test-suite unit-test
                        WorkspaceEditSpec
   build-depends:       base
                      , QuickCheck
-                     , aeson
+                     -- for instance Arbitrary Value
+                     , aeson >= 2.0.3.0
                      , containers
                      , filepath
                      , lsp

lsp/test/JsonSpec.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE FlexibleContexts     #-}
 {-# LANGUAGE TypeInType           #-}
@@ -160,16 +159,6 @@ smallList = resize 3 . listOf
 instance (Arbitrary a) => Arbitrary (List a) where
   arbitrary = List <$> arbitrary
 
-#if !MIN_VERSION_aeson(2,0,3)
-instance Arbitrary J.Value where
-  arbitrary = oneof
-    [ J.String <$> arbitrary
-    , J.Number <$> arbitrary
-    , J.Bool <$> arbitrary
-    , pure J.Null
-    ]
-#endif
-
 -- ---------------------------------------------------------------------
 
 instance Arbitrary DidChangeWatchedFilesRegistrationOptions where