diff --git a/hsfiles/mongo.hsfiles b/hsfiles/mongo.hsfiles --- a/hsfiles/mongo.hsfiles +++ b/hsfiles/mongo.hsfiles @@ -35,7 +35,7 @@ ) import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist -import Network.HTTP.Conduit (newManager, conduitManagerSettings) +import Network.HTTP.Client.Conduit (newManager) import Control.Concurrent (forkIO, threadDelay) import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize) import Network.Wai.Logger (clockDateCacher) @@ -77,7 +77,7 @@ -- performs some initialization. makeFoundation :: AppConfig DefaultEnv Extra -> IO App makeFoundation conf = do - manager <- newManager conduitManagerSettings + manager <- newManager s <- staticSite dbconf <- withYamlEnvironment "config/mongoDB.yml" (appEnv conf) Database.Persist.loadConfig >>= @@ -122,7 +122,7 @@ import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) -import Network.HTTP.Conduit (Manager) +import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) import qualified Settings import Settings.Development (development) import qualified Database.Persist @@ -147,6 +147,9 @@ , appLogger :: Logger } +instance HasHttpManager App where + getHttpManager = httpManager + -- Set up i18n messages. See the message folder. mkMessage "App" "messages" "en" @@ -405,7 +408,7 @@ build-depends: base >= 4 && < 5 , yesod >= 1.2.5 && < 1.3 , yesod-core >= 1.2 && < 1.3 - , yesod-auth >= 1.2 && < 1.3 + , yesod-auth >= 1.3 && < 1.4 , yesod-static >= 1.2 && < 1.3 , yesod-form >= 1.3 && < 1.4 , bytestring >= 0.9 && < 0.11 @@ -414,15 +417,12 @@ , persistent-mongoDB >= 1.3 && < 1.4 , persistent-template >= 1.3 && < 1.4 , template-haskell - , hamlet >= 1.1 && < 1.2 - , shakespeare-css >= 1.0 && < 1.1 - , shakespeare-js >= 1.2 && < 1.3 - , shakespeare-text >= 1.0 && < 1.1 + , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 - , http-conduit >= 2.0 && < 2.1 + , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 , warp >= 2.1 && < 2.2 , data-default diff --git a/hsfiles/mysql.hsfiles b/hsfiles/mysql.hsfiles --- a/hsfiles/mysql.hsfiles +++ b/hsfiles/mysql.hsfiles @@ -36,7 +36,7 @@ import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist import Database.Persist.Sql (runMigration) -import Network.HTTP.Conduit (newManager, conduitManagerSettings) +import Network.HTTP.Client.Conduit (newManager) import Control.Monad.Logger (runLoggingT) import Control.Concurrent (forkIO, threadDelay) import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize) @@ -79,7 +79,7 @@ -- performs some initialization. makeFoundation :: AppConfig DefaultEnv Extra -> IO App makeFoundation conf = do - manager <- newManager conduitManagerSettings + manager <- newManager s <- staticSite dbconf <- withYamlEnvironment "config/mysql.yml" (appEnv conf) Database.Persist.loadConfig >>= @@ -129,7 +129,7 @@ import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) -import Network.HTTP.Conduit (Manager) +import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) import qualified Settings import Settings.Development (development) import qualified Database.Persist @@ -154,6 +154,9 @@ , appLogger :: Logger } +instance HasHttpManager App where + getHttpManager = httpManager + -- Set up i18n messages. See the message folder. mkMessage "App" "messages" "en" @@ -409,7 +412,7 @@ build-depends: base >= 4 && < 5 , yesod >= 1.2.5 && < 1.3 , yesod-core >= 1.2 && < 1.3 - , yesod-auth >= 1.2 && < 1.3 + , yesod-auth >= 1.3 && < 1.4 , yesod-static >= 1.2 && < 1.3 , yesod-form >= 1.3 && < 1.4 , bytestring >= 0.9 && < 0.11 @@ -418,15 +421,12 @@ , persistent-mysql >= 1.3 && < 1.4 , persistent-template >= 1.3 && < 1.4 , template-haskell - , hamlet >= 1.1 && < 1.2 - , shakespeare-css >= 1.0 && < 1.1 - , shakespeare-js >= 1.2 && < 1.3 - , shakespeare-text >= 1.0 && < 1.1 + , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 - , http-conduit >= 2.0 && < 2.1 + , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 , warp >= 2.1 && < 2.2 , data-default diff --git a/hsfiles/postgres-fay.hsfiles b/hsfiles/postgres-fay.hsfiles --- a/hsfiles/postgres-fay.hsfiles +++ b/hsfiles/postgres-fay.hsfiles @@ -37,7 +37,7 @@ import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist import Database.Persist.Sql (runMigration) -import Network.HTTP.Conduit (newManager, conduitManagerSettings) +import Network.HTTP.Client.Conduit (newManager) import Yesod.Fay (getFaySite) import Control.Monad.Logger (runLoggingT) import Control.Concurrent (forkIO, threadDelay) @@ -82,7 +82,7 @@ -- performs some initialization. makeFoundation :: AppConfig DefaultEnv Extra -> IO App makeFoundation conf = do - manager <- newManager conduitManagerSettings + manager <- newManager s <- staticSite dbconf <- withYamlEnvironment "config/postgresql.yml" (appEnv conf) Database.Persist.loadConfig >>= @@ -132,7 +132,7 @@ import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) -import Network.HTTP.Conduit (Manager) +import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) import qualified Settings import Settings.Development (development) import qualified Database.Persist @@ -158,6 +158,9 @@ , appLogger :: Logger } +instance HasHttpManager App where + getHttpManager = httpManager + -- Set up i18n messages. See the message folder. mkMessage "App" "messages" "en" @@ -445,10 +448,10 @@ build-depends: base >= 4 && < 5 , yesod >= 1.2.5 && < 1.3 , yesod-core >= 1.2 && < 1.3 - , yesod-auth >= 1.2 && < 1.3 + , yesod-auth >= 1.3 && < 1.4 , yesod-static >= 1.2 && < 1.3 , yesod-form >= 1.3 && < 1.4 - , yesod-fay >= 0.4 + , yesod-fay >= 0.5.0.1 , fay >= 0.16 , bytestring >= 0.9 && < 0.11 , text >= 0.11 && < 2.0 @@ -456,14 +459,11 @@ , persistent-postgresql >= 1.3 && < 1.4 , persistent-template >= 1.3 && < 1.4 , template-haskell - , hamlet >= 1.1 && < 1.2 - , shakespeare-css >= 1.0 && < 1.1 - , shakespeare-js >= 1.2 && < 1.3 - , shakespeare-text >= 1.0 && < 1.1 + , shakespeare >= 2.0 && < 2.1 , monad-control >= 0.3 && < 0.4 , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 - , http-conduit >= 2.0 && < 2.1 + , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 , warp >= 2.1 && < 2.2 , data-default diff --git a/hsfiles/postgres.hsfiles b/hsfiles/postgres.hsfiles --- a/hsfiles/postgres.hsfiles +++ b/hsfiles/postgres.hsfiles @@ -36,7 +36,7 @@ import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist import Database.Persist.Sql (runMigration) -import Network.HTTP.Conduit (newManager, conduitManagerSettings) +import Network.HTTP.Client.Conduit (newManager) import Control.Monad.Logger (runLoggingT) import Control.Concurrent (forkIO, threadDelay) import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize) @@ -79,7 +79,7 @@ -- performs some initialization. makeFoundation :: AppConfig DefaultEnv Extra -> IO App makeFoundation conf = do - manager <- newManager conduitManagerSettings + manager <- newManager s <- staticSite dbconf <- withYamlEnvironment "config/postgresql.yml" (appEnv conf) Database.Persist.loadConfig >>= @@ -129,7 +129,7 @@ import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) -import Network.HTTP.Conduit (Manager) +import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) import qualified Settings import Settings.Development (development) import qualified Database.Persist @@ -154,6 +154,9 @@ , appLogger :: Logger } +instance HasHttpManager App where + getHttpManager = httpManager + -- Set up i18n messages. See the message folder. mkMessage "App" "messages" "en" @@ -409,7 +412,7 @@ build-depends: base >= 4 && < 5 , yesod >= 1.2.5 && < 1.3 , yesod-core >= 1.2 && < 1.3 - , yesod-auth >= 1.2 && < 1.3 + , yesod-auth >= 1.3 && < 1.4 , yesod-static >= 1.2 && < 1.3 , yesod-form >= 1.3 && < 1.4 , bytestring >= 0.9 && < 0.11 @@ -418,15 +421,12 @@ , persistent-postgresql >= 1.3 && < 1.4 , persistent-template >= 1.3 && < 1.4 , template-haskell - , hamlet >= 1.1 && < 1.2 - , shakespeare-css >= 1.0 && < 1.1 - , shakespeare-js >= 1.2 && < 1.3 - , shakespeare-text >= 1.0 && < 1.1 + , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 - , http-conduit >= 2.0 && < 2.1 + , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 , warp >= 2.1 && < 2.2 , data-default diff --git a/hsfiles/simple.hsfiles b/hsfiles/simple.hsfiles --- a/hsfiles/simple.hsfiles +++ b/hsfiles/simple.hsfiles @@ -32,7 +32,7 @@ ( mkRequestLogger, outputFormat, OutputFormat (..), IPAddrSource (..), destination ) import qualified Network.Wai.Middleware.RequestLogger as RequestLogger -import Network.HTTP.Conduit (newManager, conduitManagerSettings) +import Network.HTTP.Client.Conduit (newManager) import Control.Concurrent (forkIO, threadDelay) import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize) import Network.Wai.Logger (clockDateCacher) @@ -74,7 +74,7 @@ -- performs some initialization. makeFoundation :: AppConfig DefaultEnv Extra -> IO App makeFoundation conf = do - manager <- newManager conduitManagerSettings + manager <- newManager s <- staticSite loggerSet' <- newStdoutLoggerSet defaultBufSize @@ -112,7 +112,7 @@ import Yesod.Static import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) -import Network.HTTP.Conduit (Manager) +import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) import qualified Settings import Settings.Development (development) import Settings.StaticFiles @@ -132,6 +132,9 @@ , appLogger :: Logger } +instance HasHttpManager App where + getHttpManager = httpManager + -- Set up i18n messages. See the message folder. mkMessage "App" "messages" "en" @@ -336,21 +339,18 @@ build-depends: base >= 4 && < 5 , yesod >= 1.2.5 && < 1.3 , yesod-core >= 1.2 && < 1.3 - , yesod-auth >= 1.2 && < 1.3 + , yesod-auth >= 1.3 && < 1.4 , yesod-static >= 1.2 && < 1.3 , yesod-form >= 1.3 && < 1.4 , bytestring >= 0.9 && < 0.11 , text >= 0.11 && < 2.0 , template-haskell - , hamlet >= 1.1 && < 1.2 - , shakespeare-css >= 1.0 && < 1.1 - , shakespeare-js >= 1.2 && < 1.3 - , shakespeare-text >= 1.0 && < 1.1 + , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 - , http-conduit >= 2.0 && < 2.1 + , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 , warp >= 2.1 && < 2.2 , data-default diff --git a/hsfiles/sqlite.hsfiles b/hsfiles/sqlite.hsfiles --- a/hsfiles/sqlite.hsfiles +++ b/hsfiles/sqlite.hsfiles @@ -36,7 +36,7 @@ import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist import Database.Persist.Sql (runMigration) -import Network.HTTP.Conduit (newManager, conduitManagerSettings) +import Network.HTTP.Client.Conduit (newManager) import Control.Monad.Logger (runLoggingT) import Control.Concurrent (forkIO, threadDelay) import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize) @@ -79,7 +79,7 @@ -- performs some initialization. makeFoundation :: AppConfig DefaultEnv Extra -> IO App makeFoundation conf = do - manager <- newManager conduitManagerSettings + manager <- newManager s <- staticSite dbconf <- withYamlEnvironment "config/sqlite.yml" (appEnv conf) Database.Persist.loadConfig >>= @@ -129,7 +129,7 @@ import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) -import Network.HTTP.Conduit (Manager) +import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) import qualified Settings import Settings.Development (development) import qualified Database.Persist @@ -154,6 +154,9 @@ , appLogger :: Logger } +instance HasHttpManager App where + getHttpManager = httpManager + -- Set up i18n messages. See the message folder. mkMessage "App" "messages" "en" @@ -409,7 +412,7 @@ build-depends: base >= 4 && < 5 , yesod >= 1.2.5 && < 1.3 , yesod-core >= 1.2 && < 1.3 - , yesod-auth >= 1.2 && < 1.3 + , yesod-auth >= 1.3 && < 1.4 , yesod-static >= 1.2 && < 1.3 , yesod-form >= 1.3 && < 1.4 , bytestring >= 0.9 && < 0.11 @@ -418,15 +421,12 @@ , persistent-sqlite >= 1.3 && < 1.4 , persistent-template >= 1.3 && < 1.4 , template-haskell - , hamlet >= 1.1 && < 1.2 - , shakespeare-css >= 1.0 && < 1.1 - , shakespeare-js >= 1.2 && < 1.3 - , shakespeare-text >= 1.0 && < 1.1 + , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 - , http-conduit >= 2.0 && < 2.1 + , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 , warp >= 2.1 && < 2.2 , data-default diff --git a/yesod-bin.cabal b/yesod-bin.cabal --- a/yesod-bin.cabal +++ b/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.2.7.4 +version: 1.2.8 license: MIT license-file: LICENSE author: Michael Snoyman