Version bumps

This commit is contained in:
Michael Snoyman 2012-09-11 07:17:23 +03:00
parent 498d22714b
commit a6ce05609d
8 changed files with 40 additions and 28 deletions

View File

@ -44,10 +44,14 @@ authOpenId idType extensionFields =
name = "openid_identifier" name = "openid_identifier"
login tm = do login tm = do
ident <- lift newIdent ident <- lift newIdent
toWidget [cassius|##{ident} -- FIXME this is a hack to get GHC 7.6's type checker to allow the
-- code, but it shouldn't be necessary
let y :: a -> [(Text, Text)] -> Text
y = undefined
toWidget (\x -> [cassius|##{ident}
background: #fff url(http://www.myopenid.com/static/openid-icon-small.gif) no-repeat scroll 0pt 50%; background: #fff url(http://www.myopenid.com/static/openid-icon-small.gif) no-repeat scroll 0pt 50%;
padding-left: 18px; padding-left: 18px;
|] |] $ x `asTypeOf` y)
[whamlet| [whamlet|
$newline never $newline never
<form method="get" action="@{tm forwardUrl}"> <form method="get" action="@{tm forwardUrl}">

View File

@ -1,5 +1,5 @@
name: yesod-auth name: yesod-auth
version: 1.1.1 version: 1.1.1.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman, Patrick Brisbin author: Michael Snoyman, Patrick Brisbin

View File

@ -1046,10 +1046,14 @@ instance MonadUnsafeIO (GHandler sub master) where
instance MonadThrow (GHandler sub master) where instance MonadThrow (GHandler sub master) where
monadThrow = liftIO . throwIO monadThrow = liftIO . throwIO
instance MonadResource (GHandler sub master) where instance MonadResource (GHandler sub master) where
#if MIN_VERSION_resourcet(0,4,0)
liftResourceT = lift . liftResourceT
#else
allocate a = lift . allocate a allocate a = lift . allocate a
register = lift . register register = lift . register
release = lift . release release = lift . release
resourceMask = lift . resourceMask resourceMask = lift . resourceMask
#endif
instance MonadLogger (GHandler sub master) where instance MonadLogger (GHandler sub master) where
monadLoggerLog a b c = do monadLoggerLog a b c = do

View File

@ -341,10 +341,14 @@ instance MonadUnsafeIO (GWidget sub master) where
instance MonadThrow (GWidget sub master) where instance MonadThrow (GWidget sub master) where
monadThrow = liftIO . throwIO monadThrow = liftIO . throwIO
instance MonadResource (GWidget sub master) where instance MonadResource (GWidget sub master) where
#if MIN_VERSION_resourcet(0,4,0)
liftResourceT = lift . liftResourceT
#else
allocate a = lift . allocate a allocate a = lift . allocate a
register = lift . register register = lift . register
release = lift . release release = lift . release
resourceMask = lift . resourceMask resourceMask = lift . resourceMask
#endif
instance MonadLogger (GWidget sub master) where instance MonadLogger (GWidget sub master) where
monadLoggerLog a b = lift . monadLoggerLog a b monadLoggerLog a b = lift . monadLoggerLog a b

View File

@ -1,5 +1,5 @@
name: yesod-core name: yesod-core
version: 1.1.1.1 version: 1.1.1.2
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -74,13 +74,13 @@ library
, http-types >= 0.7 && < 0.8 , http-types >= 0.7 && < 0.8
, case-insensitive >= 0.2 , case-insensitive >= 0.2
, parsec >= 2 && < 3.2 , parsec >= 2 && < 3.2
, directory >= 1 && < 1.2 , directory >= 1
, vector >= 0.9 && < 0.10 , vector >= 0.9 && < 0.10
, aeson >= 0.5 , aeson >= 0.5
, fast-logger >= 0.2 && < 0.3 , fast-logger >= 0.2
, monad-logger >= 0.2 && < 0.3 , monad-logger >= 0.2 && < 0.3
, conduit >= 0.5 && < 0.6 , conduit >= 0.5 && < 0.6
, resourcet >= 0.3 && < 0.4 , resourcet >= 0.3 && < 0.5
, lifted-base >= 0.1 && < 0.2 , lifted-base >= 0.1 && < 0.2
, blaze-html >= 0.5 && < 0.6 , blaze-html >= 0.5 && < 0.6
, blaze-markup >= 0.5.1 && < 0.6 , blaze-markup >= 0.5.1 && < 0.6

View File

@ -1,5 +1,5 @@
name: yesod-form name: yesod-form
version: 1.1.1 version: 1.1.1.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>

View File

@ -1,5 +1,5 @@
name: yesod-static name: yesod-static
version: 1.1.0 version: 1.1.0.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -20,15 +20,15 @@ library
, containers >= 0.2 , containers >= 0.2
, old-time >= 1.0 , old-time >= 1.0
, yesod-core >= 1.1 && < 1.2 , yesod-core >= 1.1 && < 1.2
, base64-bytestring >= 0.1.0.1 && < 0.2 , base64-bytestring >= 0.1.0.1
, cereal >= 0.3 && < 0.4 , cereal >= 0.3
, bytestring >= 0.9.1.4 , bytestring >= 0.9.1.4
, template-haskell , template-haskell
, directory >= 1.0 && < 1.2 , directory >= 1.0
, transformers >= 0.2.2 && < 0.4 , transformers >= 0.2.2
, wai-app-static >= 1.3 && < 1.4 , wai-app-static >= 1.3 && < 1.4
, wai >= 1.3 && < 1.4 , wai >= 1.3 && < 1.4
, text >= 0.9 && < 1.0 , text >= 0.9
, file-embed >= 0.0.4.1 && < 0.5 , file-embed >= 0.0.4.1 && < 0.5
, http-types >= 0.7 && < 0.8 , http-types >= 0.7 && < 0.8
, unix-compat >= 0.2 , unix-compat >= 0.2
@ -48,24 +48,24 @@ test-suite tests
, hspec >= 1.3 && < 1.4 , hspec >= 1.3 && < 1.4
, HUnit , HUnit
-- copy from above -- copy from above
, containers >= 0.2 , containers
, old-time >= 1.0 , old-time
, yesod-core , yesod-core
, base64-bytestring >= 0.1.0.1 && < 0.2 , base64-bytestring
, cereal >= 0.3 && < 0.4 , cereal
, bytestring >= 0.9.1.4 , bytestring
, template-haskell , template-haskell
, directory >= 1.0 && < 1.2 , directory
, transformers >= 0.2.2 && < 0.4 , transformers
, wai-app-static , wai-app-static
, wai , wai
, text >= 0.9 && < 1.0 , text
, file-embed >= 0.0.4.1 && < 0.5 , file-embed
, http-types , http-types
, unix-compat >= 0.2 , unix-compat
, conduit , conduit
, crypto-conduit , crypto-conduit
, cryptohash >= 0.6.1 , cryptohash
, system-filepath , system-filepath
ghc-options: -Wall ghc-options: -Wall

View File

@ -1,5 +1,5 @@
name: yesod name: yesod
version: 1.1.0.2 version: 1.1.0.3
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -90,12 +90,12 @@ executable yesod
cpp-options: -DWINDOWS cpp-options: -DWINDOWS
build-depends: base >= 4.3 && < 5 build-depends: base >= 4.3 && < 5
, parsec >= 2.1 && < 4 , parsec >= 2.1 && < 4
, text >= 0.11 && < 0.12 , text >= 0.11
, shakespeare-text >= 1.0 && < 1.1 , shakespeare-text >= 1.0 && < 1.1
, bytestring >= 0.9.1.4 , bytestring >= 0.9.1.4
, time >= 1.1.4 , time >= 1.1.4
, template-haskell , template-haskell
, directory >= 1.0 && < 1.2 , directory >= 1.0
, Cabal , Cabal
, unix-compat >= 0.2 && < 0.4 , unix-compat >= 0.2 && < 0.4
, containers >= 0.2 , containers >= 0.2