remove some CPP that's obsolete since we require base 4.8+

hledger-lib/Hledger/Reports/ReportOptions.hs

@@ -38,9 +38,6 @@ where
 
 import Control.Applicative ((<|>))
 import Data.Data (Data)
-#if !MIN_VERSION_base(4,8,0)
-import Data.Functor.Compat ((<$>))
-#endif
 import Data.List
 import Data.Maybe
 import qualified Data.Text as T

hledger-ui/Hledger/UI/UIOptions.hs

@@ -6,9 +6,6 @@
 module Hledger.UI.UIOptions
 where
 import Data.Default
-#if !MIN_VERSION_base(4,8,0)
-import Data.Functor.Compat ((<$>))
-#endif
 import Data.List (intercalate)
 import System.Environment
 

hledger-web/Foundation.hs

@@ -8,9 +8,6 @@ See a default Yesod app's comments for more details of each part.
 module Foundation where
 
 import Prelude
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#endif
 import Data.IORef
 import Yesod
 import Yesod.Static

hledger-web/Handler/AddForm.hs

@@ -7,9 +7,6 @@ module Handler.AddForm where
 
 import Import
 
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative
-#endif
 import Control.Monad.State.Strict (evalStateT)
 import Data.Either (lefts,rights)
 import Data.List (sort)

hledger-web/Hledger/Web/Main.hs

@@ -19,9 +19,6 @@ import Data.String
 import Network.Wai.Handler.Warp (runSettings, defaultSettings, setHost, setPort)
 import Network.Wai.Handler.Launch (runHostPortUrl)
 --
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#endif
 import Control.Monad
 import Data.Default
 import Data.Text (pack)

hledger-web/Hledger/Web/WebOptions.hs

@@ -3,9 +3,6 @@ module Hledger.Web.WebOptions
 where
 import Prelude
 import Data.Default
-#if !MIN_VERSION_base(4,8,0)
-import Data.Functor.Compat ((<$>))
-#endif
 import Data.Maybe
 import System.Environment
 

hledger-web/Import.hs

@@ -7,9 +7,6 @@ import           Prelude              as Import hiding (head, init, last,
                                                  readFile, tail, writeFile)
 import           Yesod                as Import hiding (Route (..))
 
-#if !MIN_VERSION_base(4,8,0)
-import           Control.Applicative  as Import (pure, (<$>), (<*>))
-#endif
 import           Data.Text            as Import (Text)
 
 import           Foundation           as Import

hledger-web/Settings.hs

@@ -13,9 +13,6 @@ import Yesod.Default.Config
 import Yesod.Default.Util
 import Data.Text (Text)
 import Data.Yaml
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative
-#endif
 import Settings.Development
 import Data.Default (def)
 import Text.Hamlet

hledger/Hledger/Cli/CliOptions.hs

@@ -76,9 +76,6 @@ import qualified Control.Exception as C
 import Control.Monad (when)
 import Data.Char
 import Data.Default
-#if !MIN_VERSION_base(4,8,0)
-import Data.Functor.Compat ((<$>))
-#endif
 import Data.Functor.Identity (Identity)
 import "base-compat-batteries" Data.List.Compat
 import Data.List.Split (splitOneOf)