diff --git a/hsfiles/mongo.hsfiles b/hsfiles/mongo.hsfiles --- a/hsfiles/mongo.hsfiles +++ b/hsfiles/mongo.hsfiles @@ -122,7 +122,6 @@ import Yesod.Static import Yesod.Auth import Yesod.Auth.BrowserId -import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) @@ -251,7 +250,7 @@ } -- You can add other plugins like BrowserID, email or OAuth here - authPlugins _ = [authBrowserId def, authGoogleEmail] + authPlugins _ = [authBrowserId def] authHttpManager = httpManager @@ -346,7 +345,6 @@ {-# START_FILE Model.hs #-} module Model where -import Prelude import Yesod import Data.Text (Text) import Database.Persist.Quasi @@ -362,7 +360,7 @@ { mpsGeneric = False } in share [mkPersist mongoSettings] - $(persistFileWith lowerCaseSettings "config/models") + $(persistFileWith upperCaseSettings "config/models") {-# START_FILE PROJECTNAME.cabal #-} name: PROJECTNAME @@ -423,11 +421,11 @@ , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.1 && < 2.2 + , wai-extra >= 3.0 && < 3.1 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 - , warp >= 2.1 && < 2.2 + , warp >= 3.0 && < 3.1 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 diff --git a/hsfiles/mysql.hsfiles b/hsfiles/mysql.hsfiles --- a/hsfiles/mysql.hsfiles +++ b/hsfiles/mysql.hsfiles @@ -129,7 +129,6 @@ import Yesod.Static import Yesod.Auth import Yesod.Auth.BrowserId -import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) @@ -260,7 +259,7 @@ } -- You can add other plugins like BrowserID, email or OAuth here - authPlugins _ = [authBrowserId def, authGoogleEmail] + authPlugins _ = [authBrowserId def] authHttpManager = httpManager @@ -355,7 +354,6 @@ {-# START_FILE Model.hs #-} module Model where -import Prelude import Yesod import Data.Text (Text) import Database.Persist.Quasi @@ -427,11 +425,11 @@ , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.1 && < 2.2 + , wai-extra >= 3.0 && < 3.1 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 - , warp >= 2.1 && < 2.2 + , warp >= 3.0 && < 3.1 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 diff --git a/hsfiles/postgres-fay.hsfiles b/hsfiles/postgres-fay.hsfiles --- a/hsfiles/postgres-fay.hsfiles +++ b/hsfiles/postgres-fay.hsfiles @@ -132,7 +132,6 @@ import Yesod.Static import Yesod.Auth import Yesod.Auth.BrowserId -import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) @@ -273,7 +272,7 @@ } -- You can add other plugins like BrowserID, email or OAuth here - authPlugins _ = [authBrowserId def, authGoogleEmail] + authPlugins _ = [authBrowserId def] authHttpManager = httpManager @@ -387,7 +386,6 @@ {-# START_FILE Model.hs #-} module Model where -import Prelude import Yesod import Data.Text (Text) import Database.Persist.Quasi @@ -464,11 +462,11 @@ , template-haskell , shakespeare >= 2.0 && < 2.1 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.1 && < 2.2 + , wai-extra >= 3.0 && < 3.1 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 - , warp >= 2.1 && < 2.2 + , warp >= 3.0 && < 3.1 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 diff --git a/hsfiles/postgres.hsfiles b/hsfiles/postgres.hsfiles --- a/hsfiles/postgres.hsfiles +++ b/hsfiles/postgres.hsfiles @@ -129,7 +129,6 @@ import Yesod.Static import Yesod.Auth import Yesod.Auth.BrowserId -import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) @@ -260,7 +259,7 @@ } -- You can add other plugins like BrowserID, email or OAuth here - authPlugins _ = [authBrowserId def, authGoogleEmail] + authPlugins _ = [authBrowserId def] authHttpManager = httpManager @@ -355,7 +354,6 @@ {-# START_FILE Model.hs #-} module Model where -import Prelude import Yesod import Data.Text (Text) import Database.Persist.Quasi @@ -427,11 +425,11 @@ , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.1 && < 2.2 + , wai-extra >= 3.0 && < 3.1 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 - , warp >= 2.1 && < 2.2 + , warp >= 3.0 && < 3.1 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 diff --git a/hsfiles/simple.hsfiles b/hsfiles/simple.hsfiles --- a/hsfiles/simple.hsfiles +++ b/hsfiles/simple.hsfiles @@ -113,6 +113,8 @@ import Prelude import Yesod import Yesod.Static +import Yesod.Auth +import Yesod.Auth.BrowserId import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) @@ -351,11 +353,11 @@ , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.1 && < 2.2 + , wai-extra >= 3.0 && < 3.1 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 - , warp >= 2.1 && < 2.2 + , warp >= 3.0 && < 3.1 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 diff --git a/hsfiles/sqlite.hsfiles b/hsfiles/sqlite.hsfiles --- a/hsfiles/sqlite.hsfiles +++ b/hsfiles/sqlite.hsfiles @@ -129,7 +129,6 @@ import Yesod.Static import Yesod.Auth import Yesod.Auth.BrowserId -import Yesod.Auth.GoogleEmail import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager)) @@ -260,7 +259,7 @@ } -- You can add other plugins like BrowserID, email or OAuth here - authPlugins _ = [authBrowserId def, authGoogleEmail] + authPlugins _ = [authBrowserId def] authHttpManager = httpManager @@ -355,7 +354,6 @@ {-# START_FILE Model.hs #-} module Model where -import Prelude import Yesod import Data.Text (Text) import Database.Persist.Quasi @@ -427,11 +425,11 @@ , shakespeare >= 2.0 && < 2.1 , hjsmin >= 0.1 && < 0.2 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.1 && < 2.2 + , wai-extra >= 3.0 && < 3.1 , yaml >= 0.8 && < 0.9 , http-conduit >= 2.1 && < 2.2 , directory >= 1.1 && < 1.3 - , warp >= 2.1 && < 2.2 + , warp >= 3.0 && < 3.1 , data-default , aeson >= 0.6 && < 0.8 , conduit >= 1.0 && < 2.0 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.10 +version: 1.2.10.1 license: MIT license-file: LICENSE author: Michael Snoyman