slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #246 from sol/base-compat

Browse Source 
hledger-lib: Update for base-compat-0.8.0
This commit is contained in:
Simon Michael 2015-04-28 10:15:50 -07:00
commit 0f490478ba
5 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hledger-lib/Hledger/Data/Dates.hs
View File

@ -64,11 +64,10 @@ module Hledger.Data.Dates (
) )
where where
#if !MIN_VERSION_base(4,8,0) import Prelude ()
import Control.Applicative.Compat ((<*)) import Prelude.Compat
#endif
import Control.Monad import Control.Monad
import Data.List import Data.List.Compat
import Data.Maybe import Data.Maybe
#if MIN_VERSION_time(1,5,0) #if MIN_VERSION_time(1,5,0)
import Data.Time.Format hiding (months) import Data.Time.Format hiding (months)

6
hledger-lib/Hledger/Data/OutputFormat.hs
View File

@ -1,5 +1,4 @@
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE CPP #-}
module Hledger.Data.OutputFormat ( module Hledger.Data.OutputFormat (
parseStringFormat parseStringFormat
, formatsp , formatsp
@ -9,10 +8,9 @@ module Hledger.Data.OutputFormat (
, tests , tests
) where ) where
import Prelude ()
import Prelude.Compat
import Numeric import Numeric
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative.Compat ((<*))
#endif
import Data.Char (isPrint) import Data.Char (isPrint)
import Data.Maybe import Data.Maybe
import Test.HUnit import Test.HUnit

8
hledger-lib/Hledger/Read/CsvReader.hs
View File

@ -20,15 +20,14 @@ module Hledger.Read.CsvReader (
tests_Hledger_Read_CsvReader tests_Hledger_Read_CsvReader
) )
where where
#if !MIN_VERSION_base(4,8,0) import Prelude ()
import Control.Applicative.Compat ((<$>), (<*)) import Prelude.Compat hiding (getContents)
#endif
import Control.Exception hiding (try) import Control.Exception hiding (try)
import Control.Monad import Control.Monad
import Control.Monad.Except import Control.Monad.Except
-- import Test.HUnit -- import Test.HUnit
import Data.Char (toLower, isDigit, isSpace) import Data.Char (toLower, isDigit, isSpace)
import Data.List import Data.List.Compat
import Data.Maybe import Data.Maybe
import Data.Ord import Data.Ord
import Data.Time.Calendar (Day) import Data.Time.Calendar (Day)
@ -50,7 +49,6 @@ import Text.Parsec.Error
import Text.Printf (hPrintf,printf) import Text.Printf (hPrintf,printf)
import Hledger.Data import Hledger.Data
import Prelude hiding (getContents)
import Hledger.Utils.UTF8IOCompat (getContents) import Hledger.Utils.UTF8IOCompat (getContents)
import Hledger.Utils import Hledger.Utils
import Hledger.Read.JournalReader (amountp) import Hledger.Read.JournalReader (amountp)

12
hledger-lib/Hledger/Read/JournalReader.hs
View File

@ -45,14 +45,13 @@ module Hledger.Read.JournalReader (
#endif #endif
) )
where where
#if !MIN_VERSION_base(4,8,0) import Prelude ()
import Control.Applicative.Compat ((<*)) import Prelude.Compat hiding (readFile)
#endif
import qualified Control.Exception as C import qualified Control.Exception as C
import Control.Monad import Control.Monad.Compat
import Control.Monad.Except import Control.Monad.Except (ExceptT(..), liftIO, throwError, catchError)
import Data.Char (isNumber) import Data.Char (isNumber)
import Data.List import Data.List.Compat
import Data.List.Split (wordsBy) import Data.List.Split (wordsBy)
import Data.Maybe import Data.Maybe
import Data.Time.Calendar import Data.Time.Calendar
@ -69,7 +68,6 @@ import System.Time (getClockTime)
import Hledger.Data import Hledger.Data
import Hledger.Utils import Hledger.Utils
import Prelude hiding (readFile)
-- standard reader exports -- standard reader exports

4
hledger-lib/hledger-lib.cabal
View File

@ -89,7 +89,7 @@ library
Hledger.Utils.UTF8IOCompat Hledger.Utils.UTF8IOCompat
build-depends: build-depends:
base >= 4.3 && < 5 base >= 4.3 && < 5
,base-compat >= 0.5.0 ,base-compat >= 0.8.0
,array ,array
,blaze-markup >= 0.5.1 ,blaze-markup >= 0.5.1
,bytestring ,bytestring
@ -128,7 +128,7 @@ test-suite tests
default-language: Haskell2010 default-language: Haskell2010
build-depends: hledger-lib build-depends: hledger-lib
, base >= 4.3 && < 5 , base >= 4.3 && < 5
, base-compat >= 0.5.0 , base-compat >= 0.8.0
, array , array
, blaze-markup >= 0.5.1 , blaze-markup >= 0.5.1
, cmdargs , cmdargs