From cb6cf189194b2ee03d3c4d41891fa2e1eabc7420 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 17 Mar 2014 08:35:03 +0200 Subject: [PATCH] Scaffolding update --- yesod-bin/hsfiles/mongo.hsfiles | 11 +++++------ yesod-bin/hsfiles/mysql.hsfiles | 11 +++++------ yesod-bin/hsfiles/postgres-fay.hsfiles | 11 +++++------ yesod-bin/hsfiles/postgres.hsfiles | 11 +++++------ yesod-bin/hsfiles/simple.hsfiles | 11 +++++------ yesod-bin/hsfiles/sqlite.hsfiles | 11 +++++------ 6 files changed, 30 insertions(+), 36 deletions(-) diff --git a/yesod-bin/hsfiles/mongo.hsfiles b/yesod-bin/hsfiles/mongo.hsfiles index 62a5b71e..80b42e77 100644 --- a/yesod-bin/hsfiles/mongo.hsfiles +++ b/yesod-bin/hsfiles/mongo.hsfiles @@ -14,6 +14,7 @@ cabal-dev/ yesod-devel/ .cabal-sandbox cabal.sandbox.config +.DS_Store {-# START_FILE Application.hs #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -419,11 +420,11 @@ library , shakespeare-text >= 1.0 && < 1.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.0 && < 2.1 + , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.0 && < 2.1 , directory >= 1.1 && < 1.3 - , warp >= 2.0 && < 2.1 + , warp >= 2.1 && < 2.2 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 @@ -807,7 +808,7 @@ web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp - (runSettings, defaultSettings, settingsPort) + (runSettings, defaultSettings, setPort) import Control.Concurrent (forkIO) import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) @@ -817,9 +818,7 @@ main :: IO () main = do putStrLn "Starting devel application" (port, app) <- getApplicationDev - forkIO $ runSettings defaultSettings - { settingsPort = port - } app + forkIO $ runSettings (setPort port defaultSettings) app loop loop :: IO () diff --git a/yesod-bin/hsfiles/mysql.hsfiles b/yesod-bin/hsfiles/mysql.hsfiles index e956c156..d8d42bac 100644 --- a/yesod-bin/hsfiles/mysql.hsfiles +++ b/yesod-bin/hsfiles/mysql.hsfiles @@ -14,6 +14,7 @@ cabal-dev/ yesod-devel/ .cabal-sandbox cabal.sandbox.config +.DS_Store {-# START_FILE Application.hs #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -423,11 +424,11 @@ library , shakespeare-text >= 1.0 && < 1.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.0 && < 2.1 + , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.0 && < 2.1 , directory >= 1.1 && < 1.3 - , warp >= 2.0 && < 2.1 + , warp >= 2.1 && < 2.2 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 @@ -837,7 +838,7 @@ web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp - (runSettings, defaultSettings, settingsPort) + (runSettings, defaultSettings, setPort) import Control.Concurrent (forkIO) import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) @@ -847,9 +848,7 @@ main :: IO () main = do putStrLn "Starting devel application" (port, app) <- getApplicationDev - forkIO $ runSettings defaultSettings - { settingsPort = port - } app + forkIO $ runSettings (setPort port defaultSettings) app loop loop :: IO () diff --git a/yesod-bin/hsfiles/postgres-fay.hsfiles b/yesod-bin/hsfiles/postgres-fay.hsfiles index 4ab79c62..c89bdb01 100644 --- a/yesod-bin/hsfiles/postgres-fay.hsfiles +++ b/yesod-bin/hsfiles/postgres-fay.hsfiles @@ -15,6 +15,7 @@ cabal-dev/ yesod-devel/ .cabal-sandbox cabal.sandbox.config +.DS_Store {-# START_FILE Application.hs #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -460,11 +461,11 @@ library , shakespeare-js >= 1.2 && < 1.3 , shakespeare-text >= 1.0 && < 1.1 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.0 && < 2.1 + , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.0 && < 2.1 , directory >= 1.1 && < 1.3 - , warp >= 2.0 && < 2.1 + , warp >= 2.1 && < 2.2 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 @@ -861,7 +862,7 @@ web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp - (runSettings, defaultSettings, settingsPort) + (runSettings, defaultSettings, setPort) import Control.Concurrent (forkIO) import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) @@ -871,9 +872,7 @@ main :: IO () main = do putStrLn "Starting devel application" (port, app) <- getApplicationDev - forkIO $ runSettings defaultSettings - { settingsPort = port - } app + forkIO $ runSettings (setPort port defaultSettings) app loop loop :: IO () diff --git a/yesod-bin/hsfiles/postgres.hsfiles b/yesod-bin/hsfiles/postgres.hsfiles index 34d80db3..172afe85 100644 --- a/yesod-bin/hsfiles/postgres.hsfiles +++ b/yesod-bin/hsfiles/postgres.hsfiles @@ -14,6 +14,7 @@ cabal-dev/ yesod-devel/ .cabal-sandbox cabal.sandbox.config +.DS_Store {-# START_FILE Application.hs #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -423,11 +424,11 @@ library , shakespeare-text >= 1.0 && < 1.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.0 && < 2.1 + , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.0 && < 2.1 , directory >= 1.1 && < 1.3 - , warp >= 2.0 && < 2.1 + , warp >= 2.1 && < 2.2 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 @@ -811,7 +812,7 @@ web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp - (runSettings, defaultSettings, settingsPort) + (runSettings, defaultSettings, setPort) import Control.Concurrent (forkIO) import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) @@ -821,9 +822,7 @@ main :: IO () main = do putStrLn "Starting devel application" (port, app) <- getApplicationDev - forkIO $ runSettings defaultSettings - { settingsPort = port - } app + forkIO $ runSettings (setPort port defaultSettings) app loop loop :: IO () diff --git a/yesod-bin/hsfiles/simple.hsfiles b/yesod-bin/hsfiles/simple.hsfiles index dd537b8c..09e4f827 100644 --- a/yesod-bin/hsfiles/simple.hsfiles +++ b/yesod-bin/hsfiles/simple.hsfiles @@ -14,6 +14,7 @@ cabal-dev/ yesod-devel/ .cabal-sandbox cabal.sandbox.config +.DS_Store {-# START_FILE Application.hs #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -347,11 +348,11 @@ library , shakespeare-text >= 1.0 && < 1.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.0 && < 2.1 + , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.0 && < 2.1 , directory >= 1.1 && < 1.3 - , warp >= 2.0 && < 2.1 + , warp >= 2.1 && < 2.2 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 @@ -685,7 +686,7 @@ web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp - (runSettings, defaultSettings, settingsPort) + (runSettings, defaultSettings, setPort) import Control.Concurrent (forkIO) import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) @@ -695,9 +696,7 @@ main :: IO () main = do putStrLn "Starting devel application" (port, app) <- getApplicationDev - forkIO $ runSettings defaultSettings - { settingsPort = port - } app + forkIO $ runSettings (setPort port defaultSettings) app loop loop :: IO () diff --git a/yesod-bin/hsfiles/sqlite.hsfiles b/yesod-bin/hsfiles/sqlite.hsfiles index 715e7403..2a294299 100644 --- a/yesod-bin/hsfiles/sqlite.hsfiles +++ b/yesod-bin/hsfiles/sqlite.hsfiles @@ -14,6 +14,7 @@ cabal-dev/ yesod-devel/ .cabal-sandbox cabal.sandbox.config +.DS_Store {-# START_FILE Application.hs #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -423,11 +424,11 @@ library , shakespeare-text >= 1.0 && < 1.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.0 && < 2.1 + , wai-extra >= 2.1 && < 2.2 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.0 && < 2.1 , directory >= 1.1 && < 1.3 - , warp >= 2.0 && < 2.1 + , warp >= 2.1 && < 2.2 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 @@ -807,7 +808,7 @@ web: ./dist/build/PROJECTNAME/PROJECTNAME production -p $PORT {-# LANGUAGE PackageImports #-} import "PROJECTNAME" Application (getApplicationDev) import Network.Wai.Handler.Warp - (runSettings, defaultSettings, settingsPort) + (runSettings, defaultSettings, setPort) import Control.Concurrent (forkIO) import System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) @@ -817,9 +818,7 @@ main :: IO () main = do putStrLn "Starting devel application" (port, app) <- getApplicationDev - forkIO $ runSettings defaultSettings - { settingsPort = port - } app + forkIO $ runSettings (setPort port defaultSettings) app loop loop :: IO ()