From 7e2179f3d860838a8c9501d2a1018c2d17f8ac4a Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Sat, 4 Oct 2014 22:27:01 +0530 Subject: [PATCH] Upgraded dependencies --- hask-irc-core/Network/IRC/Bot.hs | 1 - hask-irc-core/Network/IRC/Handlers/Core.hs | 5 ++--- hask-irc-core/Network/IRC/Internal/Types.hs | 1 - hask-irc-core/Network/IRC/Util.hs | 4 ---- hask-irc-core/hask-irc-core.cabal | 3 +-- hask-irc-handlers/Network/IRC/Handlers/Greet.hs | 1 - hask-irc-handlers/Network/IRC/Handlers/MessageLogger.hs | 1 - hask-irc-handlers/Network/IRC/Handlers/NickTracker.hs | 1 - hask-irc-handlers/Network/IRC/Handlers/SongSearch.hs | 1 - hask-irc-handlers/Network/IRC/Handlers/Tell.hs | 1 - hask-irc-handlers/hask-irc-handlers.cabal | 2 +- hask-irc-runner/hask-irc-runner.cabal | 2 +- 12 files changed, 5 insertions(+), 18 deletions(-) diff --git a/hask-irc-core/Network/IRC/Bot.hs b/hask-irc-core/Network/IRC/Bot.hs index 1c852e7..35d4b4e 100644 --- a/hask-irc-core/Network/IRC/Bot.hs +++ b/hask-irc-core/Network/IRC/Bot.hs @@ -13,7 +13,6 @@ import qualified System.Log.Logger as HSL import ClassyPrelude import Control.Concurrent.Lifted (threadDelay) import Control.Exception.Lifted (mask_, mask) -import Control.Monad.Reader (ask) import Control.Monad.State (get, put) import Data.Time (addUTCTime) import System.IO (hIsEOF) diff --git a/hask-irc-core/Network/IRC/Handlers/Core.hs b/hask-irc-core/Network/IRC/Handlers/Core.hs index 23b24f8..5b26731 100644 --- a/hask-irc-core/Network/IRC/Handlers/Core.hs +++ b/hask-irc-core/Network/IRC/Handlers/Core.hs @@ -1,9 +1,8 @@ module Network.IRC.Handlers.Core (coreMsgHandlerMakers) where import ClassyPrelude -import Control.Monad.Reader (ask) -import Data.Convertible (convert) -import Data.Time (addUTCTime) +import Data.Convertible (convert) +import Data.Time (addUTCTime) import Network.IRC.Types import Network.IRC.Util diff --git a/hask-irc-core/Network/IRC/Internal/Types.hs b/hask-irc-core/Network/IRC/Internal/Types.hs index 8395afa..617abde 100644 --- a/hask-irc-core/Network/IRC/Internal/Types.hs +++ b/hask-irc-core/Network/IRC/Internal/Types.hs @@ -9,7 +9,6 @@ import qualified Data.Configurator as CF import ClassyPrelude import Control.Monad.Base (MonadBase) -import Control.Monad.Reader (ReaderT, MonadReader, runReaderT) import Control.Monad.State (StateT, MonadState, execStateT) import Data.Configurator.Types (Config) diff --git a/hask-irc-core/Network/IRC/Util.hs b/hask-irc-core/Network/IRC/Util.hs index 7efc0f7..0ad8e49 100644 --- a/hask-irc-core/Network/IRC/Util.hs +++ b/hask-irc-core/Network/IRC/Util.hs @@ -6,7 +6,6 @@ module Network.IRC.Util where import qualified Data.Text.Format as TF import ClassyPrelude -import Control.Arrow (Arrow) import Control.Monad.Base (MonadBase) import Data.Convertible (convert) import Data.Text (strip) @@ -30,9 +29,6 @@ clean = toLower . strip io :: MonadIO m => IO a -> m a io = liftIO -both :: Arrow cat => cat b d -> cat (b, b) (d, d) -both f = first f . second f - atomicModIORef :: MonadBase IO f => IORef t -> (t -> t) -> f () atomicModIORef ref f = void . atomicModifyIORef' ref $ \v -> (f v, v) diff --git a/hask-irc-core/hask-irc-core.cabal b/hask-irc-core/hask-irc-core.cabal index 712e452..308bdd8 100644 --- a/hask-irc-core/hask-irc-core.cabal +++ b/hask-irc-core/hask-irc-core.cabal @@ -54,7 +54,7 @@ library DeriveDataTypeable, Trustworthy build-depends: base >=4.5 && <4.8, - classy-prelude >=0.9 && <1.0, + classy-prelude >=0.10 && <1.0, configurator >=0.2 && <0.3, convertible >=1.1 && <1.2, hslogger >=1.2 && <1.3, @@ -63,7 +63,6 @@ library mtl >=2.1 && <2.3, network >=2.5 && <2.6, safecopy >=0.8 && <0.9, - stm >=2.4 && <2.5, text >=1.1 && <1.2, text-format >=0.3 && <0.4, time >=1.4 && <1.5, diff --git a/hask-irc-handlers/Network/IRC/Handlers/Greet.hs b/hask-irc-handlers/Network/IRC/Handlers/Greet.hs index 2e9e62f..73a2c8b 100644 --- a/hask-irc-handlers/Network/IRC/Handlers/Greet.hs +++ b/hask-irc-handlers/Network/IRC/Handlers/Greet.hs @@ -1,7 +1,6 @@ module Network.IRC.Handlers.Greet (greetMsgHandlerMaker, welcomeMsgHandlerMaker) where import ClassyPrelude -import Control.Monad.Reader (ask) import Network.IRC import Network.IRC.Util diff --git a/hask-irc-handlers/Network/IRC/Handlers/MessageLogger.hs b/hask-irc-handlers/Network/IRC/Handlers/MessageLogger.hs index 9bef65d..d86cd62 100644 --- a/hask-irc-handlers/Network/IRC/Handlers/MessageLogger.hs +++ b/hask-irc-handlers/Network/IRC/Handlers/MessageLogger.hs @@ -8,7 +8,6 @@ import qualified Data.Text.Format.Params as TF import ClassyPrelude hiding ((), (<.>), FilePath, log) import Control.Exception.Lifted (mask_) -import Control.Monad.Reader (ask) import Data.Time (diffDays) import System.Directory (createDirectoryIfMissing, getModificationTime, copyFile, removeFile) import System.FilePath (FilePath, (), (<.>)) diff --git a/hask-irc-handlers/Network/IRC/Handlers/NickTracker.hs b/hask-irc-handlers/Network/IRC/Handlers/NickTracker.hs index 2ef9667..a8e8182 100644 --- a/hask-irc-handlers/Network/IRC/Handlers/NickTracker.hs +++ b/hask-irc-handlers/Network/IRC/Handlers/NickTracker.hs @@ -9,7 +9,6 @@ import qualified Data.UUID as U import qualified Data.UUID.V4 as U import ClassyPrelude hiding (swap) -import Control.Monad.Reader (ask) import Control.Monad.State (get, put) import Data.Acid (AcidState, Query, Update, makeAcidic, query, update, openLocalState, createArchive) diff --git a/hask-irc-handlers/Network/IRC/Handlers/SongSearch.hs b/hask-irc-handlers/Network/IRC/Handlers/SongSearch.hs index 1475c5c..d9a3442 100644 --- a/hask-irc-handlers/Network/IRC/Handlers/SongSearch.hs +++ b/hask-irc-handlers/Network/IRC/Handlers/SongSearch.hs @@ -8,7 +8,6 @@ import qualified System.Log.Logger as HSL import ClassyPrelude import Control.Exception.Lifted (evaluate) -import Control.Monad.Reader (ask) import Data.Aeson (FromJSON, parseJSON, Value (..), (.:)) import Data.Aeson.Types (emptyArray) import Data.Text (strip) diff --git a/hask-irc-handlers/Network/IRC/Handlers/Tell.hs b/hask-irc-handlers/Network/IRC/Handlers/Tell.hs index 1b7acd4..aadc4c3 100644 --- a/hask-irc-handlers/Network/IRC/Handlers/Tell.hs +++ b/hask-irc-handlers/Network/IRC/Handlers/Tell.hs @@ -7,7 +7,6 @@ module Network.IRC.Handlers.Tell (tellMsgHandlerMaker) where import qualified Data.IxSet as IS import ClassyPrelude hiding (swap) -import Control.Monad.Reader (ask) import Control.Monad.State (get, put) import Data.Acid (AcidState, Query, Update, makeAcidic, query, update, openLocalState, createArchive) diff --git a/hask-irc-handlers/hask-irc-handlers.cabal b/hask-irc-handlers/hask-irc-handlers.cabal index 35b7dfc..18b81e6 100644 --- a/hask-irc-handlers/hask-irc-handlers.cabal +++ b/hask-irc-handlers/hask-irc-handlers.cabal @@ -57,7 +57,7 @@ library hask-irc-core ==0.1.0, acid-state >=0.12 && <0.13, aeson >=0.7 && <0.8, - classy-prelude >=0.9 && <1.0, + classy-prelude >=0.10 && <1.0, configurator >=0.2 && <0.3, convertible >=1.1 && <1.2, curl-aeson >=0.0.3 && <0.1, diff --git a/hask-irc-runner/hask-irc-runner.cabal b/hask-irc-runner/hask-irc-runner.cabal index 26192af..904c10d 100644 --- a/hask-irc-runner/hask-irc-runner.cabal +++ b/hask-irc-runner/hask-irc-runner.cabal @@ -63,7 +63,7 @@ executable hask-irc build-depends: base >=4.5 && <4.8, hask-irc-core ==0.1.0, hask-irc-handlers ==0.1.0, - classy-prelude >=0.9 && <1.0, + classy-prelude >=0.10 && <1.0, configurator >=0.2 && <0.3 -- Directories containing source files.