From d1cfe481fdcf6b24ac114622a5d47866ca963fc4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Feb 2015 18:32:41 +0200 Subject: [PATCH] Scaffolding update: minimal uses yesod-core --- yesod-bin/ChangeLog.md | 4 ++++ yesod-bin/hsfiles/minimal.hsfiles | 12 ++++++------ yesod-bin/yesod-bin.cabal | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md index 392daf7f..9936478c 100644 --- a/yesod-bin/ChangeLog.md +++ b/yesod-bin/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.4.3.9 + +* Scaffold update: minimal scaffold uses yesod-core instead of yesod [yesodweb/yesod-scaffold#65](https://github.com/yesodweb/yesod-scaffold/issues/65) + ## 1.4.3.8 * Scaffold update: fix 404 for missing sourcemap diff --git a/yesod-bin/hsfiles/minimal.hsfiles b/yesod-bin/hsfiles/minimal.hsfiles index 0b6c61fe..3b9384b9 100644 --- a/yesod-bin/hsfiles/minimal.hsfiles +++ b/yesod-bin/hsfiles/minimal.hsfiles @@ -31,7 +31,7 @@ cabal.sandbox.config module Add where import Foundation -import Yesod +import Yesod.Core getAddR :: Int -> Int -> Handler TypedContent getAddR x y = selectRep $ do @@ -49,7 +49,7 @@ getAddR x y = selectRep $ do module Application where import Foundation -import Yesod +import Yesod.Core import Add import Home @@ -63,7 +63,7 @@ mkYesodDispatch "App" resourcesApp {-# LANGUAGE ViewPatterns #-} module Foundation where -import Yesod +import Yesod.Core data App = App @@ -77,7 +77,7 @@ instance Yesod App module Home where import Foundation -import Yesod +import Yesod.Core getHomeR :: Handler Html getHomeR = defaultLayout $ do @@ -92,7 +92,7 @@ getHomeR = defaultLayout $ do {-# START_FILE Main.hs #-} import Application () -- for YesodDispatch instance import Foundation -import Yesod +import Yesod.Core main :: IO () main = warp 3000 App @@ -115,7 +115,7 @@ executable PROJECTNAME ghc-options: -Wall -fwarn-tabs -O2 build-depends: base - , yesod + , yesod-core ghc-options: -threaded -O2 -rtsopts -with-rtsopts=-N diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 62ae818d..01ac8569 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.4.3.7 +version: 1.4.3.9 license: MIT license-file: LICENSE author: Michael Snoyman